Skip to content

Commit 790287a

Browse files
committed
Auto merge of rust-lang#3357 - RalfJung:imports, r=RalfJung
reorder rustc crate imports a bit
2 parents 4fdb215 + 45d955e commit 790287a

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

src/tools/miri/src/bin/miri.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
rustc::untranslatable_diagnostic
99
)]
1010

11+
// Some "regular" crates we want to share with rustc
12+
#[macro_use]
13+
extern crate tracing;
14+
15+
// The rustc crates we need
1116
extern crate rustc_data_structures;
1217
extern crate rustc_driver;
1318
extern crate rustc_hir;
@@ -16,8 +21,6 @@ extern crate rustc_log;
1621
extern crate rustc_metadata;
1722
extern crate rustc_middle;
1823
extern crate rustc_session;
19-
#[macro_use]
20-
extern crate tracing;
2124

2225
use std::env::{self, VarError};
2326
use std::num::NonZero;

src/tools/miri/src/lib.rs

+7-6
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,12 @@
4949
// Needed for rustdoc from bootstrap (with `-Znormalize-docs`).
5050
#![recursion_limit = "256"]
5151

52-
extern crate either; // the one from rustc
52+
// Some "regular" crates we want to share with rustc
53+
extern crate either;
54+
#[macro_use]
55+
extern crate tracing;
5356

57+
// The rustc crates we need
5458
extern crate rustc_apfloat;
5559
extern crate rustc_ast;
5660
extern crate rustc_const_eval;
@@ -63,11 +67,8 @@ extern crate rustc_middle;
6367
extern crate rustc_session;
6468
extern crate rustc_span;
6569
extern crate rustc_target;
66-
#[macro_use]
67-
extern crate tracing;
68-
69-
// Necessary to pull in object code as the rest of the rustc crates are shipped only as rmeta
70-
// files.
70+
// Linking `rustc_driver` pulls in the required object code as the rest of the rustc crates are
71+
// shipped only as rmeta files.
7172
#[allow(unused_extern_crates)]
7273
extern crate rustc_driver;
7374

0 commit comments

Comments
 (0)