Merge remote-tracking branch 'origin/master'

Author: Byron

crates/assert-instr-macro/Cargo.toml

@@ -2,6 +2,7 @@
 name = "assert-instr-macro"
 version = "0.1.0"
 authors = ["Alex Crichton <[email protected]>"]
+edition = "2018"
 
 [lib]
 proc-macro = true

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

@@ -9,11 +9,8 @@
 //! function itself contains the relevant instruction.
 #![deny(rust_2018_idioms)]
 
-extern crate proc_macro;
-extern crate proc_macro2;
 #[macro_use]
 extern crate quote;
-extern crate syn;
 
 use proc_macro2::TokenStream;
 use quote::ToTokens;

crates/core_arch/src/simd_llvm.rs

@@ -9,19 +9,12 @@ extern "platform-intrinsic" {
     pub fn simd_gt<T, U>(x: T, y: T) -> U;
     pub fn simd_ge<T, U>(x: T, y: T) -> U;
 
-    #[rustc_args_required_const(2)]
     pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
-    #[rustc_args_required_const(2)]
     pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
-    #[rustc_args_required_const(2)]
     pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
-    #[rustc_args_required_const(2)]
     pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U;
-    #[rustc_args_required_const(2)]
     pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U;
-    #[rustc_args_required_const(2)]
     pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U;
-    #[rustc_args_required_const(2)]
     pub fn simd_shuffle128<T, U>(x: T, y: T, idx: [u32; 128]) -> U;
 
     #[rustc_const_unstable(feature = "const_simd_insert", issue = "none")]

crates/simd-test-macro/Cargo.toml

@@ -2,6 +2,7 @@
 name = "simd-test-macro"
 version = "0.1.0"
 authors = ["Alex Crichton <[email protected]>"]
+edition = "2018"
 
 [lib]
 proc-macro = true

crates/simd-test-macro/src/lib.rs

@@ -4,8 +4,6 @@
 //! for the appropriate cfg before calling the inner test function.
 #![deny(rust_2018_idioms)]
 
-extern crate proc_macro;
-extern crate proc_macro2;
 #[macro_use]
 extern crate quote;
 

crates/stdarch-test/Cargo.toml

@@ -2,6 +2,7 @@
 name = "stdarch-test"
 version = "0.1.0"
 authors = ["Alex Crichton <[email protected]>"]
+edition = "2018"
 
 [dependencies]
 assert-instr-macro = { path = "../assert-instr-macro" }

crates/stdarch-test/src/lib.rs

@@ -7,10 +7,8 @@
 #![deny(rust_2018_idioms)]
 #![allow(clippy::missing_docs_in_private_items, clippy::print_stdout)]
 
-extern crate assert_instr_macro;
 #[macro_use]
 extern crate lazy_static;
-extern crate simd_test_macro;
 #[macro_use]
 extern crate cfg_if;
 
@@ -24,7 +22,7 @@ cfg_if! {
         use wasm::disassemble_myself;
     } else {
         mod disassembly;
-        use disassembly::disassemble_myself;
+        use crate::disassembly::disassemble_myself;
     }
 }