Skip to content

Commit 7d025bb

Browse files
authored
Rollup merge of #129767 - nnethercote:rm-extern-crate-tracing-4, r=jieyouxu
Remove `#[macro_use] extern crate tracing`, round 4 Because explicit importing of macros via use items is nicer (more standard and readable) than implicit importing via #[macro_use]. Continuing the work from #124511, #124914, and #125434. After this PR no `rustc_*` crates use `#[macro_use] extern crate tracing` except for `rustc_codegen_gcc` which is a special case and I will do separately. r? ```@jieyouxu```
2 parents ff0c986 + c5e4ff1 commit 7d025bb

File tree

213 files changed

+211
-18
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+211
-18
lines changed

compiler/rustc_borrowck/src/borrow_set.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use rustc_middle::mir::{self, traversal, Body, Local, Location};
88
use rustc_middle::span_bug;
99
use rustc_middle::ty::{RegionVid, TyCtxt};
1010
use rustc_mir_dataflow::move_paths::MoveData;
11+
use tracing::debug;
1112

1213
use crate::path_utils::allow_two_phase_borrow;
1314
use crate::place_ext::PlaceExt;

compiler/rustc_borrowck/src/constraints/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use rustc_index::{IndexSlice, IndexVec};
55
use rustc_middle::mir::ConstraintCategory;
66
use rustc_middle::ty::{RegionVid, TyCtxt, VarianceDiagInfo};
77
use rustc_span::Span;
8+
use tracing::{debug, instrument};
89

910
use crate::region_infer::{ConstraintSccs, RegionDefinition, RegionTracker};
1011
use crate::type_check::Locations;

compiler/rustc_borrowck/src/dataflow.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use rustc_middle::ty::{RegionVid, TyCtxt};
1010
use rustc_mir_dataflow::fmt::DebugWithContext;
1111
use rustc_mir_dataflow::impls::{EverInitializedPlaces, MaybeUninitializedPlaces};
1212
use rustc_mir_dataflow::{Analysis, AnalysisDomain, GenKill, Results, ResultsVisitable};
13+
use tracing::debug;
1314

1415
use crate::{places_conflict, BorrowSet, PlaceConflictBias, PlaceExt, RegionInferenceContext};
1516

compiler/rustc_borrowck/src/diagnostics/bound_region_errors.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
1919
use rustc_trait_selection::traits::query::type_op;
2020
use rustc_trait_selection::traits::ObligationCtxt;
2121
use rustc_traits::{type_op_ascribe_user_type_with_span, type_op_prove_predicate_with_cause};
22+
use tracing::{debug, instrument};
2223

2324
use crate::region_infer::values::RegionElement;
2425
use crate::session_diagnostics::{

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ use rustc_trait_selection::error_reporting::traits::FindExprBySpan;
4040
use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
4141
use rustc_trait_selection::infer::InferCtxtExt;
4242
use rustc_trait_selection::traits::{Obligation, ObligationCause, ObligationCtxt};
43+
use tracing::{debug, instrument};
4344

4445
use super::explain_borrow::{BorrowExplanation, LaterUseKind};
4546
use super::{DescribePlaceOpt, RegionName, RegionNameSource, UseSpans};

compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use rustc_middle::ty::{self, RegionVid, Ty, TyCtxt};
2020
use rustc_span::symbol::{kw, Symbol};
2121
use rustc_span::{sym, DesugaringKind, Span};
2222
use rustc_trait_selection::error_reporting::traits::FindExprBySpan;
23+
use tracing::{debug, instrument};
2324

2425
use super::{find_use, RegionName, UseSpans};
2526
use crate::borrow_set::BorrowData;

compiler/rustc_borrowck/src/diagnostics/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ use rustc_trait_selection::infer::InferCtxtExt;
2727
use rustc_trait_selection::traits::{
2828
type_known_to_meet_bound_modulo_regions, FulfillmentErrorCode,
2929
};
30+
use tracing::debug;
3031

3132
use super::borrow_set::BorrowData;
3233
use super::MirBorrowckCtxt;

compiler/rustc_borrowck/src/diagnostics/move_errors.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use rustc_middle::ty::{self, Ty};
1010
use rustc_mir_dataflow::move_paths::{LookupResult, MovePathIndex};
1111
use rustc_span::{BytePos, ExpnKind, MacroKind, Span};
1212
use rustc_trait_selection::error_reporting::traits::FindExprBySpan;
13+
use tracing::debug;
1314

1415
use crate::diagnostics::{CapturedMessageOpt, DescribePlaceOpt, UseSpans};
1516
use crate::prefixes::PrefixSet;

compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use rustc_target::abi::FieldIdx;
2020
use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
2121
use rustc_trait_selection::infer::InferCtxtExt;
2222
use rustc_trait_selection::traits;
23+
use tracing::debug;
2324

2425
use crate::diagnostics::BorrowedContentSource;
2526
use crate::util::FindAssignments;

compiler/rustc_borrowck/src/diagnostics/outlives_suggestion.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use rustc_data_structures::fx::FxIndexSet;
1010
use rustc_errors::Diag;
1111
use rustc_middle::ty::RegionVid;
1212
use smallvec::SmallVec;
13+
use tracing::debug;
1314

1415
use super::{ErrorConstraintInfo, RegionName, RegionNameSource};
1516
use crate::MirBorrowckCtxt;

0 commit comments

Comments
 (0)