Attempt to fix tests on master

* Make all doctests use items from the real `std` rather than this
  crate, it's just easier
* Handle debuginfo weirdness by flagging functions as `no_mangle` that
  we're looking for instructions within.

Author: alexcrichton

crates/assert-instr-macro/src/lib.rs

@@ -49,7 +49,7 @@ pub fn assert_instr(
         .replace(':', "_")
         .replace(|c: char| c.is_whitespace(), "");
     let assert_name = syn::Ident::new(&format!("assert_{}_{}", name, instr_str), name.span());
-    let shim_name = syn::Ident::new(&format!("{}_shim", name), name.span());
+    let shim_name = syn::Ident::new(&format!("{}_shim_{}", name, assert_name), name.span());
     let mut inputs = Vec::new();
     let mut input_vals = Vec::new();
     let ret = &func.decl.output;
@@ -99,6 +99,7 @@ pub fn assert_instr(
     let shim_name_str = format!("{}{}", shim_name, assert_name);
     let to_test = quote! {
         #attrs
+        #[no_mangle]
         unsafe extern #abi fn #shim_name(#(#inputs),*) #ret {
             // The compiler in optimized mode by default runs a pass called
             // "mergefunc" where it'll merge functions that look identical.

crates/core_arch/src/core_arch_docs.md

@@ -251,16 +251,6 @@ Next up let's take a look at an example of manually using intrinsics. Here
 we'll be using SSE4.1 features to implement hex encoding.
 
 ```
-# #![cfg_attr(not(dox),feature(stdsimd))]
-# #![cfg_attr(not(dox), no_std)]
-# #[cfg(not(dox))]
-# extern crate std as real_std;
-# #[cfg(not(dox))]
-# extern crate core_arch as std;
-# #[cfg(not(dox))]
-# #[macro_use(is_x86_feature_detected)]
-# extern crate std_detect;
-
 fn main() {
     let mut dst = [0; 32];
     hex_encode(b"\x01\x02\x03", &mut dst);

crates/core_arch/src/x86/mod.rs

@@ -34,14 +34,6 @@ types! {
     ///
     /// ```
     /// # #![feature(stdsimd, mmx_target_feature)]
-    /// # #![cfg_attr(not(dox), no_std)]
-    /// # #[cfg(not(dox))]
-    /// # extern crate std as real_std;
-    /// # #[cfg(not(dox))]
-    /// # extern crate core_arch as std;
-    /// # #[cfg(not(dox))]
-    /// # #[macro_use(is_x86_feature_detected)]
-    /// # extern crate std_detect;
     /// #[cfg(target_arch = "x86")]
     /// use std::arch::x86::*;
     /// #[cfg(target_arch = "x86_64")]
@@ -85,15 +77,6 @@ types! {
     /// # Examples
     ///
     /// ```
-    /// # #![cfg_attr(not(dox), feature(stdsimd))]
-    /// # #![cfg_attr(not(dox), no_std)]
-    /// # #[cfg(not(dox))]
-    /// # extern crate std as real_std;
-    /// # #[cfg(not(dox))]
-    /// # extern crate core_arch as std;
-    /// # #[cfg(not(dox))]
-    /// # #[macro_use(is_x86_feature_detected)]
-    /// # extern crate std_detect;
     /// #[cfg(target_arch = "x86")]
     /// use std::arch::x86::*;
     /// #[cfg(target_arch = "x86_64")]
@@ -131,15 +114,6 @@ types! {
     /// # Examples
     ///
     /// ```
-    /// # #![cfg_attr(not(dox), feature(stdsimd))]
-    /// # #![cfg_attr(not(dox), no_std)]
-    /// # #[cfg(not(dox))]
-    /// # extern crate std as real_std;
-    /// # #[cfg(not(dox))]
-    /// # extern crate core_arch as std;
-    /// # #[cfg(not(dox))]
-    /// # #[macro_use(is_x86_feature_detected)]
-    /// # extern crate std_detect;
     /// #[cfg(target_arch = "x86")]
     /// use std::arch::x86::*;
     /// #[cfg(target_arch = "x86_64")]
@@ -177,15 +151,6 @@ types! {
     /// # Examples
     ///
     /// ```
-    /// # #![cfg_attr(not(dox), feature(stdsimd))]
-    /// # #![cfg_attr(not(dox), no_std)]
-    /// # #[cfg(not(dox))]
-    /// # extern crate std as real_std;
-    /// # #[cfg(not(dox))]
-    /// # extern crate core_arch as std;
-    /// # #[cfg(not(dox))]
-    /// # #[macro_use(is_x86_feature_detected)]
-    /// # extern crate std_detect;
     /// #[cfg(target_arch = "x86")]
     /// use std::arch::x86::*;
     /// #[cfg(target_arch = "x86_64")]
@@ -227,15 +192,6 @@ types! {
     /// # Examples
     ///
     /// ```
-    /// # #![cfg_attr(not(dox), feature(stdsimd))]
-    /// # #![cfg_attr(not(dox), no_std)]
-    /// # #[cfg(not(dox))]
-    /// # extern crate std as real_std;
-    /// # #[cfg(not(dox))]
-    /// # extern crate core_arch as std;
-    /// # #[cfg(not(dox))]
-    /// # #[macro_use(is_x86_feature_detected)]
-    /// # extern crate std_detect;
     /// #[cfg(target_arch = "x86")]
     /// use std::arch::x86::*;
     /// #[cfg(target_arch = "x86_64")]
@@ -273,15 +229,6 @@ types! {
     /// # Examples
     ///
     /// ```
-    /// # #![cfg_attr(not(dox), feature(stdsimd))]
-    /// # #![cfg_attr(not(dox), no_std)]
-    /// # #[cfg(not(dox))]
-    /// # extern crate std as real_std;
-    /// # #[cfg(not(dox))]
-    /// # extern crate core_arch as std;
-    /// # #[cfg(not(dox))]
-    /// # #[macro_use(is_x86_feature_detected)]
-    /// # extern crate std_detect;
     /// #[cfg(target_arch = "x86")]
     /// use std::arch::x86::*;
     /// #[cfg(target_arch = "x86_64")]
@@ -319,15 +266,6 @@ types! {
     /// # Examples
     ///
     /// ```
-    /// # #![cfg_attr(not(dox), feature(stdsimd))]
-    /// # #![cfg_attr(not(dox), no_std)]
-    /// # #[cfg(not(dox))]
-    /// # extern crate std as real_std;
-    /// # #[cfg(not(dox))]
-    /// # extern crate core_arch as std;
-    /// # #[cfg(not(dox))]
-    /// # #[macro_use(is_x86_feature_detected)]
-    /// # extern crate std_detect;
     /// #[cfg(target_arch = "x86")]
     /// use std::arch::x86::*;
     /// #[cfg(target_arch = "x86_64")]

crates/core_arch/src/x86_64/bmi2.rs

@@ -20,7 +20,7 @@ use stdsimd_test::assert_instr;
 ///
 /// [Intel's documentation](https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mulx_u64)
 #[inline]
-#[cfg_attr(test, assert_instr(mulx))]
+#[cfg_attr(test, assert_instr(mul))]
 #[target_feature(enable = "bmi2")]
 #[cfg(not(target_arch = "x86"))] // calls an intrinsic
 #[stable(feature = "simd_x86", since = "1.27.0")]