Auto merge of #132580 - compiler-errors:globs, r=Noratrieb

Remove unnecessary pub enum glob-imports from `rustc_middle::ty`
We used to have an idiom in the compiler where we'd prefix or suffix all the variants of an enum, for example `BoundRegionKind`, with something like `Br`, and then *glob-import* that enum variant directly.
`@noratrieb` brought this up, and I think that it's easier to read when we just use the normal style `EnumName::Variant`.
This PR is a bit large, but it's just naming.
The only somewhat opinionated change that this PR does is rename `BorrowKind::Imm` to `BorrowKind::Immutable` and same for the other variants. I think these enums are used sparingly enough that the extra length is fine.
r? `@noratrieb` or reassign

Author: bors

clippy_lints/src/loops/mut_range_bound.rs

@@ -80,7 +80,7 @@ impl<'tcx> Delegate<'tcx> for MutatePairDelegate<'_, 'tcx> {
 fnconsume(&mutself, _:&PlaceWithHirId<'tcx>, _:HirId){}
 
 fnborrow(&mutself,cmt:&PlaceWithHirId<'tcx>,diag_expr_id:HirId,bk: ty::BorrowKind){
-if bk == ty::BorrowKind::MutBorrow{
+if bk == ty::BorrowKind::Mutable{
 ifletPlaceBase::Local(id) = cmt.place.base{
 ifSome(id) == self.hir_id_low && !BreakAfterExprVisitor::is_found(self.cx, diag_expr_id){
 self.span_low = Some(self.cx.tcx.hir().span(diag_expr_id));

clippy_lints/src/missing_inline.rs

@@ -2,6 +2,7 @@ use clippy_utils::diagnostics::span_lint;
 use rustc_ast::ast;
 use rustc_hir as hir;
 use rustc_lint::{LateContext,LateLintPass,LintContext};
+use rustc_middle::ty::AssocItemContainer;
 use rustc_session::declare_lint_pass;
 use rustc_span::{Span, sym};
 
@@ -138,7 +139,6 @@ impl<'tcx> LateLintPass<'tcx> for MissingInline {
 }
 
 fncheck_impl_item(&mutself,cx:&LateContext<'tcx>,impl_item:&'tcx hir::ImplItem<'_>){
-use rustc_middle::ty::{ImplContainer,TraitContainer};
 if rustc_middle::lint::in_external_macro(cx.sess(), impl_item.span) || is_executable_or_proc_macro(cx){
 return;
 }
@@ -156,8 +156,8 @@ impl<'tcx> LateLintPass<'tcx> for MissingInline {
 let assoc_item = cx.tcx.associated_item(impl_item.owner_id);
 let container_id = assoc_item.container_id(cx.tcx);
 let trait_def_id = match assoc_item.container{
-TraitContainer => Some(container_id),
-ImplContainer => cx.tcx.impl_trait_ref(container_id).map(|t| t.skip_binder().def_id),
+AssocItemContainer::Trait => Some(container_id),
+AssocItemContainer::Impl => cx.tcx.impl_trait_ref(container_id).map(|t| t.skip_binder().def_id),
 };
 
 ifletSome(trait_def_id) = trait_def_id {

clippy_lints/src/needless_pass_by_ref_mut.rs

@@ -417,16 +417,16 @@ impl<'tcx> euv::Delegate<'tcx> for MutablyUsedVariablesCtxt<'tcx> {
 // a closure, it'll return this variant whereas if you have just an index access, it'll
 // return `ImmBorrow`. So if there is "Unique" and it's a mutable reference, we add it
 // to the mutably used variables set.
-if borrow == ty::BorrowKind::MutBorrow
- || (borrow == ty::BorrowKind::UniqueImmBorrow && base_ty.ref_mutability() == Some(Mutability::Mut))
+if borrow == ty::BorrowKind::Mutable
+ || (borrow == ty::BorrowKind::UniqueImmutable && base_ty.ref_mutability() == Some(Mutability::Mut))
 {
 self.add_mutably_used_var(*vid);
 }elseifself.is_in_unsafe_block(id){
 // If we are in an unsafe block, any operation on this variable must not be warned
 // upon!
 self.add_mutably_used_var(*vid);
 }
-}elseif borrow == ty::ImmBorrow{
+}elseif borrow == ty::BorrowKind::Immutable{
 // If there is an `async block`, it'll contain a call to a closure which we need to
 // go into to ensure all "mutate" checks are found.
 ifletNode::Expr(Expr{

clippy_lints/src/operators/assign_op_pattern.rs

@@ -102,7 +102,7 @@ fn imm_borrows_in_expr(cx: &LateContext<'_>, e: &hir::Expr<'_>) -> HirIdSet {
 structS(HirIdSet);
 implDelegate<'_>forS{
 fnborrow(&mutself,place:&PlaceWithHirId<'_>, _:HirId,kind:BorrowKind){
-ifmatches!(kind,BorrowKind::ImmBorrow | BorrowKind::UniqueImmBorrow){
+ifmatches!(kind,BorrowKind::Immutable | BorrowKind::UniqueImmutable){
 self.0.insert(match place.place.base{
 PlaceBase::Local(id) => id,
 PlaceBase::Upvar(id) => id.var_path.hir_id,
@@ -127,7 +127,7 @@ fn mut_borrows_in_expr(cx: &LateContext<'_>, e: &hir::Expr<'_>) -> HirIdSet {
 structS(HirIdSet);
 implDelegate<'_>forS{
 fnborrow(&mutself,place:&PlaceWithHirId<'_>, _:HirId,kind:BorrowKind){
-ifmatches!(kind,BorrowKind::MutBorrow){
+ifmatches!(kind,BorrowKind::Mutable){
 self.0.insert(match place.place.base{
 PlaceBase::Local(id) => id,
 PlaceBase::Upvar(id) => id.var_path.hir_id,

clippy_lints/src/unwrap.rs

@@ -217,7 +217,7 @@ fn is_option_as_mut_use(tcx: TyCtxt<'_>, expr_id: HirId) -> bool {
 
 impl<'tcx>Delegate<'tcx>forMutationVisitor<'tcx>{
 fnborrow(&mutself,cat:&PlaceWithHirId<'tcx>,diag_expr_id:HirId,bk: ty::BorrowKind){
-iflet ty::BorrowKind::MutBorrow = bk
+iflet ty::BorrowKind::Mutable = bk
  && is_potentially_local_place(self.local_id,&cat.place)
  && !is_option_as_mut_use(self.tcx, diag_expr_id)
 {

clippy_utils/src/lib.rs

@@ -1209,8 +1209,8 @@ pub fn can_move_expr_to_closure<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'
 let capture = match capture.info.capture_kind{
 UpvarCapture::ByValue => CaptureKind::Value,
 UpvarCapture::ByRef(kind) => match kind {
-BorrowKind::ImmBorrow => CaptureKind::Ref(Mutability::Not),
-BorrowKind::UniqueImmBorrow | BorrowKind::MutBorrow => {
+BorrowKind::Immutable => CaptureKind::Ref(Mutability::Not),
+BorrowKind::UniqueImmutable | BorrowKind::Mutable => {
 CaptureKind::Ref(Mutability::Mut)
 },
 },
@@ -3340,8 +3340,8 @@ pub fn get_path_from_caller_to_method_type<'tcx>(
 let assoc_item = tcx.associated_item(method);
 let def_id = assoc_item.container_id(tcx);
 match assoc_item.container{
- rustc_ty::TraitContainer => get_path_to_callee(tcx, from, def_id),
- rustc_ty::ImplContainer => {
+ rustc_ty::AssocItemContainer::Trait => get_path_to_callee(tcx, from, def_id),
+ rustc_ty::AssocItemContainer::Impl => {
 let ty = tcx.type_of(def_id).instantiate_identity();
 get_path_to_ty(tcx, from, ty, args)
 },

clippy_utils/src/usage.rs

@@ -67,7 +67,7 @@ impl<'tcx> Delegate<'tcx> for MutVarsDelegate {
 fnconsume(&mutself, _:&PlaceWithHirId<'tcx>, _:HirId){}
 
 fnborrow(&mutself,cmt:&PlaceWithHirId<'tcx>, _:HirId,bk: ty::BorrowKind){
-if bk == ty::BorrowKind::MutBorrow{
+if bk == ty::BorrowKind::Mutable{
 self.update(cmt);
 }
 }