15 files changed, 44 insertions, 52 deletions
diff --git a/library/stdarch/crates/assert-instr-macro/src/lib.rs b/library/stdarch/crates/assert-instr-macro/src/lib.rs
index 6abbd1a6376..5320bcba377 100644
--- a/library/stdarch/crates/assert-instr-macro/src/lib.rs
+++ b/library/stdarch/crates/assert-instr-macro/src/lib.rs
@@ -137,7 +137,7 @@ struct Invoc {
 }
 
 impl syn::synom::Synom for Invoc {
-    named!(parse -> Self, map!(parens!(do_parse!(
+    named!(parse -> Self, do_parse!(
         instr: syn!(syn::Expr) >>
         args: many0!(do_parse!(
             syn!(syn::token::Comma) >>
@@ -150,7 +150,7 @@ impl syn::synom::Synom for Invoc {
             instr,
             args,
         })
-    )), |p| p.1));
+    ));
 }
 
 struct Append<T>(T);
diff --git a/library/stdarch/crates/coresimd/src/lib.rs b/library/stdarch/crates/coresimd/src/lib.rs
index f4b3f1ff5db..be097b97798 100644
--- a/library/stdarch/crates/coresimd/src/lib.rs
+++ b/library/stdarch/crates/coresimd/src/lib.rs
@@ -6,15 +6,17 @@
 //!
 //! [stdsimd]: https://rust-lang-nursery.github.io/stdsimd/x86_64/stdsimd/
 
-#![cfg_attr(feature = "strict", deny(warnings))]
+#![cfg_attr(stdsimd_strict, deny(warnings))]
 #![allow(dead_code)]
 #![allow(unused_features)]
 #![feature(const_fn, link_llvm_intrinsics, platform_intrinsics, repr_simd,
-           simd_ffi, target_feature, cfg_target_feature, asm,
+           simd_ffi, asm,
            integer_atomics, stmt_expr_attributes, core_intrinsics,
            crate_in_paths, no_core, attr_literals, rustc_attrs, stdsimd,
            staged_api, fn_must_use, core_float, core_slice_ext, align_offset,
-           doc_cfg)]
+           doc_cfg, mmx_target_feature, tbm_target_feature,
+           sse4a_target_feature, arm_target_feature, aarch64_target_feature,
+           mips_target_feature)]
 #![cfg_attr(test,
             feature(proc_macro, test, attr_literals, abi_vectorcall,
                     untagged_unions))]
diff --git a/library/stdarch/crates/coresimd/tests/cpu-detection.rs b/library/stdarch/crates/coresimd/tests/cpu-detection.rs
index 5bd28f82728..2a788102a40 100644
--- a/library/stdarch/crates/coresimd/tests/cpu-detection.rs
+++ b/library/stdarch/crates/coresimd/tests/cpu-detection.rs
@@ -1,5 +1,5 @@
-#![feature(cfg_target_feature, stdsimd)]
-#![cfg_attr(feature = "strict", deny(warnings))]
+#![feature(stdsimd)]
+#![cfg_attr(stdsimd_strict, deny(warnings))]
 #![cfg_attr(feature = "cargo-clippy",
             allow(option_unwrap_used, print_stdout, use_debug))]
 
diff --git a/library/stdarch/crates/coresimd/tests/endian_tests.rs b/library/stdarch/crates/coresimd/tests/endian_tests.rs
index 27618f24e3e..8bb9c490510 100644
--- a/library/stdarch/crates/coresimd/tests/endian_tests.rs
+++ b/library/stdarch/crates/coresimd/tests/endian_tests.rs
@@ -1,5 +1,5 @@
-#![feature(cfg_target_feature, stdsimd)]
-#![cfg_attr(feature = "strict", deny(warnings))]
+#![feature(stdsimd)]
+#![cfg_attr(stdsimd_strict, deny(warnings))]
 
 extern crate core;
 extern crate coresimd;
diff --git a/library/stdarch/crates/coresimd/tests/reductions.rs b/library/stdarch/crates/coresimd/tests/reductions.rs
index 1ce2df28732..fd247156853 100644
--- a/library/stdarch/crates/coresimd/tests/reductions.rs
+++ b/library/stdarch/crates/coresimd/tests/reductions.rs
@@ -1,4 +1,8 @@
-#![feature(cfg_target_feature, stdsimd, target_feature)]
+#![feature(stdsimd, sse4a_target_feature, avx512_target_feature)]
+#![feature(arm_target_feature)]
+#![feature(aarch64_target_feature)]
+#![feature(powerpc_target_feature)]
+#![allow(unused_attributes)]
 
 #[macro_use]
 extern crate stdsimd;
diff --git a/library/stdarch/crates/coresimd/tests/v128.rs b/library/stdarch/crates/coresimd/tests/v128.rs
index c08154238fe..3cba8811cbc 100644
--- a/library/stdarch/crates/coresimd/tests/v128.rs
+++ b/library/stdarch/crates/coresimd/tests/v128.rs
@@ -1,8 +1,7 @@
 //! coresimd 128-bit wide vector tests
 
-#![cfg_attr(feature = "strict", deny(warnings))]
-#![feature(stdsimd, link_llvm_intrinsics, simd_ffi, core_float,
-           cfg_target_feature)]
+#![cfg_attr(stdsimd_strict, deny(warnings))]
+#![feature(stdsimd, link_llvm_intrinsics, simd_ffi, core_float)]
 #![allow(unused_imports, dead_code)]
 
 #[cfg(test)]
diff --git a/library/stdarch/crates/coresimd/tests/v16.rs b/library/stdarch/crates/coresimd/tests/v16.rs
index efa52454306..77c78323fe5 100644
--- a/library/stdarch/crates/coresimd/tests/v16.rs
+++ b/library/stdarch/crates/coresimd/tests/v16.rs
@@ -1,8 +1,7 @@
 //! coresimd 16-bit wide vector tests
 
-#![cfg_attr(feature = "strict", deny(warnings))]
-#![feature(stdsimd, link_llvm_intrinsics, simd_ffi, core_float,
-           cfg_target_feature)]
+#![cfg_attr(stdsimd_strict, deny(warnings))]
+#![feature(stdsimd, link_llvm_intrinsics, simd_ffi, core_float)]
 #![allow(unused_imports, dead_code)]
 
 #[cfg(test)]
diff --git a/library/stdarch/crates/coresimd/tests/v256.rs b/library/stdarch/crates/coresimd/tests/v256.rs
index 67c6db7cf2f..fac31c316f7 100644
--- a/library/stdarch/crates/coresimd/tests/v256.rs
+++ b/library/stdarch/crates/coresimd/tests/v256.rs
@@ -1,8 +1,7 @@
 //! coresimd 256-bit wide vector tests
 
-#![cfg_attr(feature = "strict", deny(warnings))]
-#![feature(stdsimd, link_llvm_intrinsics, simd_ffi, core_float,
-           cfg_target_feature)]
+#![cfg_attr(stdsimd_strict, deny(warnings))]
+#![feature(stdsimd, link_llvm_intrinsics, simd_ffi, core_float)]
 #![allow(unused_imports)]
 
 #[cfg(test)]
diff --git a/library/stdarch/crates/coresimd/tests/v32.rs b/library/stdarch/crates/coresimd/tests/v32.rs
index d1fd44a903d..3f89acc9a05 100644
--- a/library/stdarch/crates/coresimd/tests/v32.rs
+++ b/library/stdarch/crates/coresimd/tests/v32.rs
@@ -1,8 +1,7 @@
 //! coresimd 32-bit wide vector tests
 
-#![cfg_attr(feature = "strict", deny(warnings))]
-#![feature(stdsimd, link_llvm_intrinsics, simd_ffi, core_float,
-           cfg_target_feature)]
+#![cfg_attr(stdsimd_strict, deny(warnings))]
+#![feature(stdsimd, link_llvm_intrinsics, simd_ffi, core_float)]
 #![allow(unused_imports, dead_code)]
 
 #[cfg(test)]
diff --git a/library/stdarch/crates/coresimd/tests/v512.rs b/library/stdarch/crates/coresimd/tests/v512.rs
index 35d40415e24..cda06613701 100644
--- a/library/stdarch/crates/coresimd/tests/v512.rs
+++ b/library/stdarch/crates/coresimd/tests/v512.rs
@@ -1,8 +1,7 @@
 //! coresimd 512-bit wide vector tests
 
-#![cfg_attr(feature = "strict", deny(warnings))]
-#![feature(stdsimd, link_llvm_intrinsics, simd_ffi, core_float,
-           cfg_target_feature)]
+#![cfg_attr(stdsimd_strict, deny(warnings))]
+#![feature(stdsimd, link_llvm_intrinsics, simd_ffi, core_float)]
 #![allow(unused_imports)]
 
 #[cfg(test)]
diff --git a/library/stdarch/crates/coresimd/tests/v64.rs b/library/stdarch/crates/coresimd/tests/v64.rs
index e66cf6ca7e4..65b91219ca9 100644
--- a/library/stdarch/crates/coresimd/tests/v64.rs
+++ b/library/stdarch/crates/coresimd/tests/v64.rs
@@ -1,8 +1,7 @@
 //! coresimd 64-bit wide vector tests
 
-#![cfg_attr(feature = "strict", deny(warnings))]
-#![feature(stdsimd, link_llvm_intrinsics, simd_ffi, core_float,
-           cfg_target_feature)]
+#![cfg_attr(stdsimd_strict, deny(warnings))]
+#![feature(stdsimd, link_llvm_intrinsics, simd_ffi, core_float)]
 #![allow(unused_imports, dead_code)]
 
 #[cfg(test)]
diff --git a/library/stdarch/crates/simd-test-macro/src/lib.rs b/library/stdarch/crates/simd-test-macro/src/lib.rs
index 24e78e0996f..5e37c63b6c0 100644
--- a/library/stdarch/crates/simd-test-macro/src/lib.rs
+++ b/library/stdarch/crates/simd-test-macro/src/lib.rs
@@ -25,31 +25,30 @@ pub fn simd_test(
     let tokens = TokenStream::from(attr)
         .into_iter()
         .collect::<Vec<_>>();
-    if tokens.len() != 2 {
-        panic!("expected #[simd_test = \"feature\"]");
+    if tokens.len() != 3 {
+        panic!("expected #[simd_test(enable = \"feature\")]");
     }
     match &tokens[0] {
+        TokenTree::Term(tt) if tt.to_string() == "enable" => {}
+        _ => panic!("expected #[simd_test(enable = \"feature\")]"),
+    }
+    match &tokens[1] {
         TokenTree::Op(tt) if tt.op() == '=' => {}
-        _ => panic!("expected #[simd_test = \"feature\"]"),
+        _ => panic!("expected #[simd_test(enable = \"feature\")]"),
     }
-    let target_features = match &tokens[1] {
+    let enable_feature = match &tokens[2] {
         TokenTree::Literal(tt) => tt.to_string(),
-        _ => panic!("expected #[simd_test = \"feature\"]"),
+        _ => panic!("expected #[simd_test(enable = \"feature\")]"),
     };
-    let target_features: Vec<String> = target_features
-        .replace('"', "")
+    let enable_feature = enable_feature
+        .trim_left_matches('"')
+        .trim_right_matches('"');
+    let target_features: Vec<String> = enable_feature
         .replace('+', "")
         .split(',')
         .map(|v| String::from(v))
         .collect();
 
-    let enable_feature = match &tokens[1] {
-        TokenTree::Literal(tt) => tt.to_string(),
-        _ => panic!("expected #[simd_test = \"feature\"]"),
-    };
-    let enable_feature = enable_feature
-        .trim_left_matches('"')
-        .trim_right_matches('"');
     let enable_feature = string(enable_feature);
     let item = TokenStream::from(item);
     let name = find_name(item.clone());
diff --git a/library/stdarch/crates/stdsimd/Cargo.toml b/library/stdarch/crates/stdsimd/Cargo.toml
index edb62b9637d..328229ba8a4 100644
--- a/library/stdarch/crates/stdsimd/Cargo.toml
+++ b/library/stdarch/crates/stdsimd/Cargo.toml
@@ -29,13 +29,6 @@ quickcheck = "0.6"
 rand = "0.4"
 cupid = "0.5.0"
 
-[features]
-# Internal-usage only: denies all warnings.
-strict = [ "coresimd/strict" ]
-# Internal-usage only: enables only those intrinsics supported by Intel's
-# Software Development Environment (SDE).
-intel_sde = [ "coresimd/intel_sde" ]
-
 [[example]]
 name = "hex"
 path = "../../examples/hex.rs"
diff --git a/library/stdarch/crates/stdsimd/src/lib.rs b/library/stdarch/crates/stdsimd/src/lib.rs
index 86866c54a6a..aa2e51ce103 100644
--- a/library/stdarch/crates/stdsimd/src/lib.rs
+++ b/library/stdarch/crates/stdsimd/src/lib.rs
@@ -8,7 +8,7 @@
 //! [stdsimd]: https://rust-lang-nursery.github.io/stdsimd/x86_64/stdsimd/
 
 #![feature(const_fn, integer_atomics, staged_api, stdsimd)]
-#![feature(cfg_target_feature, doc_cfg, allow_internal_unstable)]
+#![feature(doc_cfg, allow_internal_unstable)]
 #![cfg_attr(feature = "cargo-clippy", allow(shadow_reuse))]
 #![cfg_attr(target_os = "linux", feature(linkage))]
 #![no_std]
diff --git a/library/stdarch/crates/stdsimd/tests/cpu-detection.rs b/library/stdarch/crates/stdsimd/tests/cpu-detection.rs
index 0653ba3af2d..62c04656d15 100644
--- a/library/stdarch/crates/stdsimd/tests/cpu-detection.rs
+++ b/library/stdarch/crates/stdsimd/tests/cpu-detection.rs
@@ -1,5 +1,5 @@
-#![feature(cfg_target_feature, stdsimd)]
-#![cfg_attr(feature = "strict", deny(warnings))]
+#![feature(stdsimd)]
+#![cfg_attr(stdsimd_strict, deny(warnings))]
 #![cfg_attr(feature = "cargo-clippy",
             allow(option_unwrap_used, use_debug, print_stdout))]