Remove BorrowKind glob, make names longer

Author: compiler-errors

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/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)
 },
 },

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);
 }
 }