Merge pull request #245 from Manishearth/testfix

Fix tests; update to latest nightly

Author: Manishearth

src/lib.rs

@@ -261,6 +261,10 @@ pub fn make_test(config: &Config, testpaths: &TestPaths) -> test::TestDescAndFn
             ignore: early_props.ignore,
             should_panic: should_panic,
             allow_fail: false,
+            #[cfg(feature = "rustc")]
+            compile_fail: false,
+            #[cfg(feature = "rustc")]
+            no_run: false,
             test_type: test::TestType::IntegrationTest,
         },
         testfn: make_test_closure(config, testpaths),

test-project/tests/compile-fail/asm-gated.rs

@@ -10,6 +10,6 @@
 
 fn main() {
     unsafe {
-        llvm_asm!(""); //~ ERROR use of unstable library feature
+        asm!(""); //~ ERROR use of unstable library feature
     }
 }

test-project/tests/pretty/macro.pp

@@ -8,6 +8,6 @@
 // pretty-mode:expanded
 // pp-exact:macro.pp
 
-macro_rules! square { ($ x : expr) => { $ x * $ x } ; }
+macro_rules! square { ($x : expr) => { $x * $x } ; }
 
 fn f() -> i8 { 5 * 5 }

test-project/tests/ui/dyn-keyword.stderr

@@ -9,7 +9,7 @@ note: the lint level is defined here
    |
 14 | #![deny(keyword_idents)]
    |         ^^^^^^^^^^^^^^
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
+   = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2018!
    = note: for more information, see issue #49716 <https://github.com/rust-lang/rust/issues/49716>
 
 error: aborting due to previous error