Skip to content

Commit d1f5bee

Browse files
committed
Remove #[macro_use] extern crate tracing from rustc_resolve.
Explicit imports are more standard nowadays and easier to read.
1 parent 41aea27 commit d1f5bee

10 files changed

+15
-9
lines changed

compiler/rustc_resolve/src/build_reduced_graph.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ use rustc_span::Span;
3232

3333
use std::cell::Cell;
3434

35+
use tracing::debug;
36+
3537
type Res = def::Res<NodeId>;
3638

3739
impl<'a, Id: Into<DefId>> ToNameBinding<'a>

compiler/rustc_resolve/src/def_collector.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use rustc_hir::def_id::LocalDefId;
77
use rustc_span::hygiene::LocalExpnId;
88
use rustc_span::symbol::{kw, sym, Symbol};
99
use rustc_span::Span;
10+
use tracing::debug;
1011

1112
pub(crate) fn collect_definitions(
1213
resolver: &mut Resolver<'_, '_>,

compiler/rustc_resolve/src/diagnostics.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ use rustc_span::source_map::SourceMap;
2828
use rustc_span::symbol::{kw, sym, Ident, Symbol};
2929
use rustc_span::{BytePos, Span, SyntaxContext};
3030
use thin_vec::{thin_vec, ThinVec};
31+
use tracing::debug;
3132

3233
use crate::errors::{
3334
self, AddedMacroUse, ChangeImportBinding, ChangeImportBindingSuggestion, ConsiderAddingADerive,

compiler/rustc_resolve/src/effective_visibilities.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use rustc_middle::middle::privacy::Level;
1111
use rustc_middle::middle::privacy::{EffectiveVisibilities, EffectiveVisibility};
1212
use rustc_middle::ty::Visibility;
1313
use std::mem;
14+
use tracing::info;
1415

1516
#[derive(Clone, Copy)]
1617
enum ParentId<'a> {

compiler/rustc_resolve/src/ident.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use rustc_span::hygiene::{ExpnId, ExpnKind, LocalExpnId, MacroKind, SyntaxContex
1111
use rustc_span::sym;
1212
use rustc_span::symbol::{kw, Ident};
1313
use rustc_span::Span;
14+
use tracing::{debug, instrument};
1415

1516
use crate::errors::{ParamKindInEnumDiscriminant, ParamKindInNonTrivialAnonConst};
1617
use crate::late::{ConstantHasGenerics, NoConstantGenericsReason, PathSource, Rib, RibKind};

compiler/rustc_resolve/src/imports.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ use rustc_span::hygiene::LocalExpnId;
3434
use rustc_span::symbol::{kw, Ident, Symbol};
3535
use rustc_span::Span;
3636
use smallvec::SmallVec;
37+
use tracing::debug;
3738

3839
use std::cell::Cell;
3940
use std::mem;

compiler/rustc_resolve/src/late.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ use rustc_span::source_map::{respan, Spanned};
3030
use rustc_span::symbol::{kw, sym, Ident, Symbol};
3131
use rustc_span::{BytePos, Span, SyntaxContext};
3232
use smallvec::{smallvec, SmallVec};
33+
use tracing::{debug, instrument, trace};
3334

3435
use std::assert_matches::debug_assert_matches;
3536
use std::borrow::Cow;

compiler/rustc_resolve/src/late/diagnostics.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ use std::iter;
4040
use std::ops::Deref;
4141

4242
use thin_vec::ThinVec;
43+
use tracing::debug;
4344

4445
use super::NoConstantGenericsReason;
4546

compiler/rustc_resolve/src/lib.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@
2323
#![feature(rustdoc_internals)]
2424
// tidy-alphabetical-end
2525

26-
#[macro_use]
27-
extern crate tracing;
28-
29-
use errors::{
30-
ParamKindInEnumDiscriminant, ParamKindInNonTrivialAnonConst, ParamKindInTyOfConstParam,
31-
};
3226
use rustc_arena::{DroplessArena, TypedArena};
3327
use rustc_ast::expand::StrippedCfgItem;
3428
use rustc_ast::node_id::NodeMap;
@@ -61,19 +55,21 @@ use rustc_session::lint::LintBuffer;
6155
use rustc_span::hygiene::{ExpnId, LocalExpnId, MacroKind, SyntaxContext, Transparency};
6256
use rustc_span::symbol::{kw, sym, Ident, Symbol};
6357
use rustc_span::{Span, DUMMY_SP};
64-
6558
use smallvec::{smallvec, SmallVec};
6659
use std::cell::{Cell, RefCell};
6760
use std::collections::BTreeSet;
6861
use std::fmt;
62+
use tracing::debug;
6963

7064
use diagnostics::{ImportSuggestion, LabelSuggestion, Suggestion};
65+
use effective_visibilities::EffectiveVisibilitiesVisitor;
66+
use errors::{
67+
ParamKindInEnumDiscriminant, ParamKindInNonTrivialAnonConst, ParamKindInTyOfConstParam,
68+
};
7169
use imports::{Import, ImportData, ImportKind, NameResolution};
7270
use late::{HasGenericParams, PathSource, PatternSource, UnnecessaryQualification};
7371
use macros::{MacroRulesBinding, MacroRulesScope, MacroRulesScopeRef};
7472

75-
use crate::effective_visibilities::EffectiveVisibilitiesVisitor;
76-
7773
type Res = def::Res<NodeId>;
7874

7975
mod build_reduced_graph;

compiler/rustc_resolve/src/rustdoc.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use rustc_span::symbol::{kw, sym, Symbol};
88
use rustc_span::{InnerSpan, Span, DUMMY_SP};
99
use std::mem;
1010
use std::ops::Range;
11+
use tracing::{debug, trace};
1112

1213
#[derive(Clone, Copy, PartialEq, Eq, Debug)]
1314
pub enum DocFragmentKind {

0 commit comments

Comments
 (0)