Fix tools

Author: mejrs

src/librustdoc/clean/auto_trait.rs

@@ -2,8 +2,8 @@ use rustc_data_structures::fx::{FxIndexMap, FxIndexSet, IndexEntry};
 use rustc_data_structures::thin_vec::ThinVec;
 use rustc_hir as hir;
 use rustc_infer::infer::region_constraints::{ConstraintKind, RegionConstraintData};
-use rustc_middle::bug;
 use rustc_middle::ty::{self, Region, Ty, fold_regions};
+use rustc_span::bug;
 use rustc_span::def_id::DefId;
 use rustc_span::symbol::{Symbol, kw};
 use rustc_trait_selection::traits::auto_trait::{self, RegionTarget};

src/librustdoc/clean/mod.rs

@@ -51,10 +51,9 @@ use rustc_middle::ty::{
     self, AdtKind, GenericArgsRef, RegionExt, Ty, TyCtxt, TypeVisitableExt, TypingMode,
     Unnormalized,
 };
-use rustc_middle::{bug, span_bug};
-use rustc_span::ExpnKind;
 use rustc_span::hygiene::{AstPass, MacroKind};
 use rustc_span::symbol::{Ident, Symbol, kw};
+use rustc_span::{ExpnKind, bug, span_bug};
 use rustc_trait_selection::traits::wf::object_region_bounds;
 use tracing::{debug, instrument};
 use utils::*;

src/librustdoc/clean/types.rs

@@ -18,7 +18,6 @@ use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE, LocalDefId};
 use rustc_hir::{Attribute, BodyId, ConstStability, Mutability, Stability, StableSince, find_attr};
 use rustc_index::IndexVec;
 use rustc_metadata::rendered_const;
-use rustc_middle::span_bug;
 use rustc_middle::ty::fast_reject::SimplifiedType;
 use rustc_middle::ty::{self, Ty, TyCtxt, Visibility};
 use rustc_resolve::rustdoc::{
@@ -28,7 +27,7 @@ use rustc_session::Session;
 use rustc_span::def_id::{CRATE_DEF_ID, ModId};
 use rustc_span::hygiene::MacroKind;
 use rustc_span::symbol::{Symbol, kw, sym};
-use rustc_span::{DUMMY_SP, FileName, Ident, Loc, RemapPathScopeComponents};
+use rustc_span::{DUMMY_SP, FileName, Ident, Loc, RemapPathScopeComponents, span_bug};
 use tracing::{debug, trace};
 
 pub(crate) use self::ItemKind::*;

src/librustdoc/html/render/type_layout.rs

@@ -3,8 +3,9 @@ use std::fmt;
 use askama::Template;
 use rustc_abi::{Primitive, TagEncoding, Variants};
 use rustc_hir::def_id::DefId;
+use rustc_middle::ty;
 use rustc_middle::ty::layout::LayoutError;
-use rustc_middle::{span_bug, ty};
+use rustc_span::span_bug;
 use rustc_span::symbol::Symbol;
 
 use crate::html::render::Context;

src/librustdoc/json/conversions.rs

@@ -15,10 +15,9 @@ use rustc_hir::def_id::DefId;
 use rustc_hir::{HeaderSafety, Safety, find_attr, intravisit};
 use rustc_hir_pretty::PpAnn;
 use rustc_metadata::rendered_const;
-use rustc_middle::ty::TyCtxt;
-use rustc_middle::{bug, ty};
+use rustc_middle::ty::{self, TyCtxt};
 use rustc_span::def_id::ModId;
-use rustc_span::{Pos, Symbol, kw, sym};
+use rustc_span::{Pos, Symbol, bug, kw, sym};
 use rustdoc_json_types::*;
 
 use crate::clean::{self, ItemId};

src/librustdoc/passes/collect_intra_doc_links.rs

@@ -17,17 +17,17 @@ use rustc_hir::def::{DefKind, MacroKinds, Namespace, PerNS};
 use rustc_hir::def_id::{CRATE_DEF_ID, DefId, LOCAL_CRATE};
 use rustc_hir::{Attribute, Mutability, Safety, find_attr};
 use rustc_lint::Lint;
+use rustc_middle::ty;
 use rustc_middle::ty::{Ty, TyCtxt};
-use rustc_middle::{bug, span_bug, ty};
 use rustc_resolve::rustdoc::pulldown_cmark::LinkType;
 use rustc_resolve::rustdoc::{
     MalformedGenerics, has_primitive_or_keyword_or_attribute_docs, prepare_to_doc_link_resolution,
     source_span_for_markdown_range, strip_generics_from_path,
 };
-use rustc_span::BytePos;
 use rustc_span::def_id::ModId;
 use rustc_span::edit_distance::find_best_match_for_name;
 use rustc_span::symbol::{Ident, Symbol, sym};
+use rustc_span::{BytePos, bug, span_bug};
 use rustc_structures::CrateType;
 use smallvec::{SmallVec, smallvec};
 use tracing::{debug, info, instrument, trace};

src/tools/clippy/clippy_lints/src/arbitrary_source_item_ordering.rs

@@ -13,7 +13,7 @@ use rustc_hir::{
 };
 use rustc_lint::{LateContext, LateLintPass, LintContext, impl_lint_pass};
 use rustc_middle::ty::{AssocKind, TyCtxt};
-use rustc_span::{Ident, Symbol};
+use rustc_span::{Ident, Symbol, bug};
 
 declare_clippy_lint! {
     /// ### What it does
@@ -528,7 +528,7 @@ impl<'tcx> LateLintPass<'tcx> for ArbitrarySourceItemOrdering {
                         continue;
                     }
                     if cfg!(debug_assertions) {
-                        rustc_middle::bug!("unknown item: {item:?}");
+                        bug!("unknown item: {item:?}");
                     }
                 }
             } else if let ItemKind::Impl(_) = item.kind

src/tools/clippy/clippy_utils/src/consts.rs

@@ -19,11 +19,10 @@ use rustc_hir::{
 };
 use rustc_lexer::{FrontmatterAllowed, tokenize};
 use rustc_lint::LateContext;
-use rustc_middle::mir::ConstValue;
 use rustc_middle::mir::interpret::{Scalar, alloc_range};
+use rustc_middle::mir::{self, ConstValue};
 use rustc_middle::ty::{self, FloatTy, IntTy, ScalarInt, Ty, TyCtxt, TypeckResults, UintTy};
-use rustc_middle::{bug, mir, span_bug};
-use rustc_span::{Symbol, SyntaxContext};
+use rustc_span::{Symbol, SyntaxContext, bug, span_bug};
 use std::cell::Cell;
 use std::cmp::Ordering;
 use std::hash::{Hash, Hasher};

src/tools/miri/src/lib.rs

@@ -107,7 +107,7 @@ pub use rustc_const_eval::interpret::*;
 pub use rustc_const_eval::interpret::{self, AllocMap, Provenance as _};
 pub use rustc_data_structures::either::Either;
 pub use rustc_log::tracing::{self, info, trace, warn};
-pub use rustc_middle::{bug, span_bug};
+pub use rustc_span::{bug, span_bug};
 
 #[cfg(all(feature = "native-lib", unix))]
 pub mod native_lib {