Fix imports

Author: nbdd0121

src/attribute.rs

@@ -1,7 +1,7 @@
 use rustc_ast::tokenstream::{self, TokenTree};
 use rustc_ast::{ast, token};
 use rustc_data_structures::sync::Lrc;
-use rustc_errors::{DiagnosticBuilder, ErrorGuaranteed};
+use rustc_errors::{Diag, ErrorGuaranteed};
 use rustc_hir::HirId;
 use rustc_middle::ty::TyCtxt;
 use rustc_span::symbol::Ident;
@@ -73,7 +73,7 @@ impl<'tcx> AttrParser<'tcx> {
     fn error(
         &self,
         span: Span,
-        decorate: impl for<'a, 'b> FnOnce(&'b mut DiagnosticBuilder<'a, ()>),
+        decorate: impl for<'a, 'b> FnOnce(&'b mut Diag<'a, ()>),
     ) -> Result<!, ErrorGuaranteed> {
         self.tcx.node_span_lint(
             crate::INCORRECT_ATTRIBUTE,

src/preempt_count/adjustment.rs

@@ -1,4 +1,4 @@
-use rustc_errors::{DiagnosticBuilder, EmissionGuarantee, MultiSpan};
+use rustc_errors::{Diag, EmissionGuarantee, ErrorGuaranteed, MultiSpan};
 use rustc_hir::def_id::{CrateNum, DefId};
 use rustc_hir::LangItem;
 use rustc_middle::mir::{Body, TerminatorKind, UnwindAction};
@@ -7,7 +7,7 @@ use rustc_mir_dataflow::Analysis;
 use rustc_mir_dataflow::JoinSemiLattice;
 
 use super::dataflow::{AdjustmentBoundsOrError, AdjustmentComputation};
-use super::*;
+use super::{Error, PolyDisplay, UseSiteKind};
 use crate::ctxt::AnalysisCtxt;
 
 impl<'tcx> AnalysisCtxt<'tcx> {
@@ -27,7 +27,7 @@ impl<'tcx> AnalysisCtxt<'tcx> {
 
     pub fn emit_with_use_site_info<G: EmissionGuarantee>(
         &self,
-        mut diag: DiagnosticBuilder<'tcx, G>,
+        mut diag: Diag<'tcx, G>,
     ) -> G::EmitResult {
         let call_stack = self.call_stack.borrow();
 

src/preempt_count/check.rs

@@ -1,5 +1,3 @@
-use super::*;
-use crate::ctxt::AnalysisCtxt;
 use rustc_hir::def_id::DefId;
 use rustc_hir::LangItem;
 use rustc_infer::traits::util::PredicateSet;
@@ -10,6 +8,10 @@ use rustc_middle::ty::{
     self, GenericArgs, GenericParamDefKind, Instance, ParamEnv, ParamEnvAnd, ToPredicate, Ty,
     TyCtxt, TypeFoldable, TypeVisitableExt,
 };
+use rustc_span::Span;
+
+use super::{Error, PolyDisplay, UseSite, UseSiteKind};
+use crate::ctxt::AnalysisCtxt;
 
 struct MirNeighborVisitor<'mir, 'tcx, 'cx> {
     cx: &'cx AnalysisCtxt<'tcx>,
@@ -502,7 +504,8 @@ memoize!(
                     .predicates
                     .into_iter()
                     .filter_map(|(pred, _)| {
-                        pred.instantiate_supertrait(cx.tcx, &trait_ref).as_trait_clause()
+                        pred.instantiate_supertrait(cx.tcx, &trait_ref)
+                            .as_trait_clause()
                     });
                 for supertrait in super_traits {
                     if visited.insert(supertrait.to_predicate(cx.tcx)) {

src/preempt_count/dataflow.rs

@@ -3,7 +3,7 @@ use rustc_middle::ty::{self, Instance, ParamEnv};
 use rustc_mir_dataflow::JoinSemiLattice;
 use rustc_mir_dataflow::{fmt::DebugWithContext, Analysis, AnalysisDomain};
 
-use super::*;
+use super::{Error, UseSite, UseSiteKind};
 use crate::ctxt::AnalysisCtxt;
 
 /// Bounds of adjustments.

src/preempt_count/expectation.rs

@@ -8,7 +8,7 @@ use rustc_mir_dataflow::Analysis;
 use rustc_span::DUMMY_SP;
 
 use super::dataflow::AdjustmentComputation;
-use super::*;
+use super::{AdjustmentBounds, Error, ExpectationRange, PolyDisplay, UseSite, UseSiteKind};
 use crate::ctxt::AnalysisCtxt;
 
 impl<'tcx> AnalysisCtxt<'tcx> {
@@ -80,7 +80,7 @@ impl<'tcx> AnalysisCtxt<'tcx> {
         body: &Body<'tcx>,
         expected: ExpectationRange,
         span: Option<MultiSpan>,
-        diag: &mut rustc_errors::DiagnosticBuilder<'_, G>,
+        diag: &mut rustc_errors::Diag<'_, G>,
     ) -> Result<(), Error> {
         let mut analysis_result = AdjustmentComputation {
             checker: self,
@@ -253,7 +253,7 @@ impl<'tcx> AnalysisCtxt<'tcx> {
         instance: Instance<'tcx>,
         expected: ExpectationRange,
         span: MultiSpan,
-        diag: &mut rustc_errors::DiagnosticBuilder<'_, G>,
+        diag: &mut rustc_errors::Diag<'_, G>,
     ) -> Result<(), Error> {
         match instance.def {
             // No Rust built-in intrinsics will mess with preemption count.
@@ -336,7 +336,7 @@ impl<'tcx> AnalysisCtxt<'tcx> {
         ty: Ty<'tcx>,
         expected: ExpectationRange,
         span: MultiSpan,
-        diag: &mut rustc_errors::DiagnosticBuilder<'_, G>,
+        diag: &mut rustc_errors::Diag<'_, G>,
     ) -> Result<(), Error> {
         // If the type doesn't need drop, then there is trivially no expectation.
         assert!(ty.needs_drop(self.tcx, param_env));