Skip to content

Commit c822e46

Browse files
committed
Convert all crates to 2018 edition
1 parent 15babf5 commit c822e46

File tree

9 files changed

+6
-15
lines changed

9 files changed

+6
-15
lines changed

crates/assert-instr-macro/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name = "assert-instr-macro"
33
version = "0.1.0"
44
authors = ["Alex Crichton <[email protected]>"]
5+
edition = "2018"
56

67
[lib]
78
proc-macro = true

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@
88
//! `#[test]` function to the original token stream which asserts that the
99
//! function itself contains the relevant instruction.
1010
11-
extern crate proc_macro;
12-
extern crate proc_macro2;
1311
#[macro_use]
1412
extern crate quote;
15-
extern crate syn;
1613

1714
use proc_macro2::TokenStream;
1815
use quote::ToTokens;

crates/core_arch/src/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ extern crate std;
6868
#[cfg(test)]
6969
#[macro_use]
7070
extern crate std_detect;
71-
#[cfg(test)]
72-
extern crate stdarch_test;
73-
7471
#[path = "mod.rs"]
7572
mod core_arch;
7673

crates/core_arch/src/x86/avx512vpclmulqdq.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::core_arch::x86::__m256i;
99
use crate::core_arch::x86::__m512i;
1010

1111
#[cfg(test)]
12-
use crate::stdarch_test::assert_instr;
12+
use stdarch_test::assert_instr;
1313

1414
#[allow(improper_ctypes)]
1515
extern "C" {

crates/core_arch/src/x86/pclmulqdq.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use crate::core_arch::x86::__m128i;
99

1010
#[cfg(test)]
11-
use crate::stdarch_test::assert_instr;
11+
use stdarch_test::assert_instr;
1212

1313
#[allow(improper_ctypes)]
1414
extern "C" {

crates/simd-test-macro/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name = "simd-test-macro"
33
version = "0.1.0"
44
authors = ["Alex Crichton <[email protected]>"]
5+
edition = "2018"
56

67
[lib]
78
proc-macro = true

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
//! This macro expands to a `#[test]` function which tests the local machine
44
//! for the appropriate cfg before calling the inner test function.
55
6-
extern crate proc_macro;
7-
extern crate proc_macro2;
86
#[macro_use]
97
extern crate quote;
108

crates/stdarch-test/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name = "stdarch-test"
33
version = "0.1.0"
44
authors = ["Alex Crichton <[email protected]>"]
5+
edition = "2018"
56

67
[dependencies]
78
assert-instr-macro = { path = "../assert-instr-macro" }

crates/stdarch-test/src/lib.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@
66
#![feature(test)] // For black_box
77
#![allow(clippy::missing_docs_in_private_items, clippy::print_stdout)]
88

9-
extern crate assert_instr_macro;
10-
extern crate cc;
119
#[macro_use]
1210
extern crate lazy_static;
13-
extern crate rustc_demangle;
14-
extern crate simd_test_macro;
1511
#[macro_use]
1612
extern crate cfg_if;
1713

@@ -25,7 +21,7 @@ cfg_if! {
2521
use wasm::disassemble_myself;
2622
} else {
2723
mod disassembly;
28-
use disassembly::disassemble_myself;
24+
use crate::disassembly::disassemble_myself;
2925
}
3026
}
3127

0 commit comments

Comments
 (0)