From c9019c25dc07016b12ff646f78475a3d8251fb51 Mon Sep 17 00:00:00 2001
From: Joshua Nelson <jyn514@gmail.com>
Date: Sun, 11 Apr 2021 10:26:35 -0400
Subject: [PATCH] Convert all crates to 2018 edition (#1109)

---
 crates/assert-instr-macro/Cargo.toml | 1 +
 crates/assert-instr-macro/src/lib.rs | 3 ---
 crates/simd-test-macro/Cargo.toml    | 1 +
 crates/simd-test-macro/src/lib.rs    | 2 --
 crates/stdarch-test/Cargo.toml       | 1 +
 crates/stdarch-test/src/lib.rs       | 4 +---
 6 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/crates/assert-instr-macro/Cargo.toml b/crates/assert-instr-macro/Cargo.toml
index eeefca2540..3d9b32067f 100644
--- a/crates/assert-instr-macro/Cargo.toml
+++ b/crates/assert-instr-macro/Cargo.toml
@@ -2,6 +2,7 @@
 name = "assert-instr-macro"
 version = "0.1.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
+edition = "2018"
 
 [lib]
 proc-macro = true
diff --git a/crates/assert-instr-macro/src/lib.rs b/crates/assert-instr-macro/src/lib.rs
index 0a879e037e..ef76c1c0d4 100644
--- a/crates/assert-instr-macro/src/lib.rs
+++ b/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;
diff --git a/crates/simd-test-macro/Cargo.toml b/crates/simd-test-macro/Cargo.toml
index 039fe8c768..c3ecf981e6 100644
--- a/crates/simd-test-macro/Cargo.toml
+++ b/crates/simd-test-macro/Cargo.toml
@@ -2,6 +2,7 @@
 name = "simd-test-macro"
 version = "0.1.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
+edition = "2018"
 
 [lib]
 proc-macro = true
diff --git a/crates/simd-test-macro/src/lib.rs b/crates/simd-test-macro/src/lib.rs
index 4c863ae701..407c154475 100644
--- a/crates/simd-test-macro/src/lib.rs
+++ b/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;
 
diff --git a/crates/stdarch-test/Cargo.toml b/crates/stdarch-test/Cargo.toml
index cf62372a5f..9ac1057be7 100644
--- a/crates/stdarch-test/Cargo.toml
+++ b/crates/stdarch-test/Cargo.toml
@@ -2,6 +2,7 @@
 name = "stdarch-test"
 version = "0.1.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
+edition = "2018"
 
 [dependencies]
 assert-instr-macro = { path = "../assert-instr-macro" }
diff --git a/crates/stdarch-test/src/lib.rs b/crates/stdarch-test/src/lib.rs
index 25852c9479..0275b8d16d 100644
--- a/crates/stdarch-test/src/lib.rs
+++ b/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;
     }
 }