Explicitly import tracing macros

compiler/rustc_next_trait_solver/src/lib.rs

@@ -6,10 +6,6 @@
 
 #![feature(let_chains)]
 
-// TODO: remove this, use explicit imports.
-#[macro_use]
-extern crate tracing;
-
 pub mod canonicalizer;
 pub mod infcx;
 pub mod resolve;

compiler/rustc_next_trait_solver/src/solve/alias_relate.rs

@@ -17,6 +17,7 @@
 
 use rustc_type_ir::inherent::*;
 use rustc_type_ir::{self as ty, Interner};
+use tracing::{instrument, trace};
 
 use crate::infcx::SolverDelegate;
 use crate::solve::{Certainty, EvalCtxt, Goal, QueryResult};

compiler/rustc_next_trait_solver/src/solve/assembly/mod.rs

@@ -7,6 +7,7 @@ use rustc_type_ir::inherent::*;
 use rustc_type_ir::lang_items::TraitSolverLangItem;
 use rustc_type_ir::visit::TypeVisitableExt as _;
 use rustc_type_ir::{self as ty, Interner, Upcast as _};
+use tracing::{debug, instrument};
 
 use crate::infcx::SolverDelegate;
 use crate::solve::inspect::ProbeKind;

compiler/rustc_next_trait_solver/src/solve/assembly/structural_traits.rs

@@ -8,6 +8,7 @@ use rustc_type_ir::inherent::*;
 use rustc_type_ir::lang_items::TraitSolverLangItem;
 use rustc_type_ir::{self as ty, Interner, Upcast as _};
 use rustc_type_ir_macros::{TypeFoldable_Generic, TypeVisitable_Generic};
+use tracing::instrument;
 
 use crate::infcx::SolverDelegate;
 use crate::solve::{EvalCtxt, Goal, NoSolution};

compiler/rustc_next_trait_solver/src/solve/eval_ctxt/canonical.rs

@@ -15,6 +15,7 @@ use rustc_index::IndexVec;
 use rustc_type_ir::fold::TypeFoldable;
 use rustc_type_ir::inherent::*;
 use rustc_type_ir::{self as ty, Canonical, CanonicalVarValues, Interner};
+use tracing::{instrument, trace};
 
 use crate::canonicalizer::{CanonicalizeMode, Canonicalizer};
 use crate::infcx::SolverDelegate;

compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs

@@ -8,6 +8,7 @@ use rustc_type_ir::relate::Relate;
 use rustc_type_ir::visit::{TypeSuperVisitable, TypeVisitable, TypeVisitableExt, TypeVisitor};
 use rustc_type_ir::{self as ty, CanonicalVarValues, Interner};
 use rustc_type_ir_macros::{Lift_Generic, TypeFoldable_Generic, TypeVisitable_Generic};
+use tracing::{instrument, trace};
 
 use crate::infcx::SolverDelegate;
 use crate::solve::inspect::{self, ProofTreeBuilder};

compiler/rustc_next_trait_solver/src/solve/eval_ctxt/probe.rs

@@ -1,6 +1,7 @@
 use std::marker::PhantomData;
 
 use rustc_type_ir::Interner;
+use tracing::instrument;
 
 use crate::infcx::SolverDelegate;
 use crate::solve::assembly::Candidate;

compiler/rustc_next_trait_solver/src/solve/mod.rs

@@ -23,12 +23,12 @@ mod project_goals;
 mod search_graph;
 mod trait_goals;
 
-pub use self::eval_ctxt::{EvalCtxt, GenerateProofTree, SolverDelegateEvalExt};
-pub use rustc_type_ir::solve::*;
-
 use rustc_type_ir::inherent::*;
+pub use rustc_type_ir::solve::*;
 use rustc_type_ir::{self as ty, Interner};
+use tracing::instrument;
 
+pub use self::eval_ctxt::{EvalCtxt, GenerateProofTree, SolverDelegateEvalExt};
 use crate::infcx::SolverDelegate;
 
 /// How many fixpoint iterations we should attempt inside of the solver before bailing

compiler/rustc_next_trait_solver/src/solve/normalizes_to/anon_const.rs

@@ -1,4 +1,5 @@
 use rustc_type_ir::{self as ty, Interner};
+use tracing::instrument;
 
 use crate::infcx::SolverDelegate;
 use crate::solve::{Certainty, EvalCtxt, Goal, QueryResult};

compiler/rustc_next_trait_solver/src/solve/normalizes_to/mod.rs

@@ -7,6 +7,7 @@ use rustc_type_ir::inherent::*;
 use rustc_type_ir::lang_items::TraitSolverLangItem;
 use rustc_type_ir::Upcast as _;
 use rustc_type_ir::{self as ty, Interner, NormalizesTo};
+use tracing::instrument;
 
 use crate::infcx::SolverDelegate;
 use crate::solve::assembly::structural_traits::{self, AsyncCallableRelevantTypes};

compiler/rustc_next_trait_solver/src/solve/project_goals.rs

@@ -1,4 +1,5 @@
 use rustc_type_ir::{self as ty, Interner, ProjectionPredicate};
+use tracing::instrument;
 
 use crate::infcx::SolverDelegate;
 use crate::solve::{Certainty, EvalCtxt, Goal, GoalSource, QueryResult};

compiler/rustc_next_trait_solver/src/solve/search_graph.rs

@@ -4,6 +4,7 @@ use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_index::{Idx, IndexVec};
 use rustc_type_ir::inherent::*;
 use rustc_type_ir::Interner;
+use tracing::debug;
 
 use crate::infcx::SolverDelegate;
 use crate::solve::inspect::{self, ProofTreeBuilder};

compiler/rustc_next_trait_solver/src/solve/trait_goals.rs

@@ -6,6 +6,7 @@ use rustc_type_ir::inherent::*;
 use rustc_type_ir::lang_items::TraitSolverLangItem;
 use rustc_type_ir::visit::TypeVisitableExt as _;
 use rustc_type_ir::{self as ty, Interner, TraitPredicate, Upcast as _};
+use tracing::{instrument, trace};
 
 use crate::infcx::SolverDelegate;
 use crate::solve::assembly::structural_traits::{self, AsyncCallableRelevantTypes};