cleanup: s/impl Copy/#[derive(Copy)]/g

[rust.git] / src / test / run-pass / issue-14936.rs

diff --git a/src/test/run-pass/issue-14936.rs b/src/test/run-pass/issue-14936.rs
index 123ad36ee4f2d7c84a1e2d31dca870871bb2fb95..a441729e2d0ba015287dad9217a5a823f59a9a4a 100644 (file)
--- a/src/test/run-pass/issue-14936.rs
+++ b/src/test/run-pass/issue-14936.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(asm, macro_rules)]
+#![feature(asm)]
 
 type History = Vec<&'static str>;
 
@@ -30,13 +30,13 @@ macro_rules! demo {
                      : "r"(&wrap(y, "in", &mut history)));
             }
             assert_eq!((x,y), (1,1));
-            assert_eq!(history.as_slice(), &["out", "in"]);
+            let b: &[_] = &["out", "in"];
+            assert_eq!(history.as_slice(), b);
         }
     }
 }
 
-#[cfg(target_arch = "x86")]
-#[cfg(target_arch = "x86_64")]
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 fn main() {
     fn out_write_only_expr_then_in_expr() {
         demo!("=r")
@@ -50,5 +50,5 @@ fn out_read_write_expr_then_in_expr() {
     out_read_write_expr_then_in_expr();
 }
 
-#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"))]
+#[cfg(all(not(target_arch = "x86"), not(target_arch = "x86_64")))]
 pub fn main() {}