Skip to content

Commit e9a3e54

Browse files
ManishearthManishearth
committed
MutImmutable -> Immutable, MutMutable -> Mutable, CaptureClause -> CaptureBy
1 parent 79d3b30 commit e9a3e54

19 files changed

+59
-55
lines changed

‎clippy_lints/src/functions.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ fn is_mutable_ty<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, ty: Ty<'tcx>, span: Span,
548548
Tuple(ref substs) => substs.types().any(|ty| is_mutable_ty(cx, ty, span, tys)),
549549
Array(ty, _) | Slice(ty) => is_mutable_ty(cx, ty, span, tys),
550550
RawPtr(ty::TypeAndMut { ty, mutbl }) | Ref(_, ty, mutbl) => {
551-
mutbl == hir::Mutability::MutMutable || is_mutable_ty(cx, ty, span, tys)
551+
mutbl == hir::Mutability::Mutable || is_mutable_ty(cx, ty, span, tys)
552552
},
553553
// calling something constitutes a side effect, so return true on all callables
554554
// also never calls need not be used, so return true for them, too
@@ -653,7 +653,7 @@ impl<'a, 'tcx> intravisit::Visitor<'tcx> for StaticMutVisitor<'a, 'tcx> {
653653
tys.clear();
654654
}
655655
},
656-
Assign(ref target, _) | AssignOp(_, ref target, _) | AddrOf(hir::Mutability::MutMutable, ref target) => {
656+
Assign(ref target, _) | AssignOp(_, ref target, _) | AddrOf(hir::Mutability::Mutable, ref target) => {
657657
self.mutates_static |= is_mutated_static(self.cx, target)
658658
},
659659
_ => {},

‎clippy_lints/src/loops.rs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,8 +1506,8 @@ fn make_iterator_snippet(cx: &LateContext<'_, '_>, arg: &Expr, applic_ref: &mut
15061506
match &arg.kind {
15071507
ExprKind::AddrOf(mutability, arg_inner) if has_iter_method(cx, cx.tables.expr_ty(&arg_inner)).is_some() => {
15081508
let meth_name = match mutability {
1509-
MutMutable => "iter_mut",
1510-
MutImmutable => "iter",
1509+
Mutability::Mutable => "iter_mut",
1510+
Mutability::Immutable => "iter",
15111511
};
15121512
format!(
15131513
"{}.{}()",
@@ -1539,14 +1539,14 @@ fn check_for_loop_over_map_kv<'a, 'tcx>(
15391539
let (new_pat_span, kind, ty, mutbl) = match cx.tables.expr_ty(arg).kind {
15401540
ty::Ref(_, ty, mutbl) => match (&pat[0].kind, &pat[1].kind) {
15411541
(key, _) if pat_is_wild(key, body) => (pat[1].span, "value", ty, mutbl),
1542-
(_, value) if pat_is_wild(value, body) => (pat[0].span, "key", ty, MutImmutable),
1542+
(_, value) if pat_is_wild(value, body) => (pat[0].span, "key", ty, Mutability::Immutable),
15431543
_ => return,
15441544
},
15451545
_ => return,
15461546
};
15471547
let mutbl = match mutbl {
1548-
MutImmutable => "",
1549-
MutMutable => "_mut",
1548+
Mutability::Immutable => "",
1549+
Mutability::Mutable => "_mut",
15501550
};
15511551
let arg = match arg.kind {
15521552
ExprKind::AddrOf(_, ref expr) => &**expr,
@@ -1874,7 +1874,7 @@ impl<'a, 'tcx> Visitor<'tcx> for VarVisitor<'a, 'tcx> {
18741874
self.visit_expr(rhs);
18751875
},
18761876
ExprKind::AddrOf(mutbl, ref expr) => {
1877-
if mutbl == MutMutable {
1877+
if mutbl == Mutability::Mutable {
18781878
self.prefer_mutable = true;
18791879
}
18801880
self.visit_expr(expr);
@@ -1885,7 +1885,7 @@ impl<'a, 'tcx> Visitor<'tcx> for VarVisitor<'a, 'tcx> {
18851885
let ty = self.cx.tables.expr_ty_adjusted(expr);
18861886
self.prefer_mutable = false;
18871887
if let ty::Ref(_, _, mutbl) = ty.kind {
1888-
if mutbl == MutMutable {
1888+
if mutbl == Mutability::Mutable {
18891889
self.prefer_mutable = true;
18901890
}
18911891
}
@@ -1897,7 +1897,7 @@ impl<'a, 'tcx> Visitor<'tcx> for VarVisitor<'a, 'tcx> {
18971897
for (ty, expr) in self.cx.tcx.fn_sig(def_id).inputs().skip_binder().iter().zip(args) {
18981898
self.prefer_mutable = false;
18991899
if let ty::Ref(_, _, mutbl) = ty.kind {
1900-
if mutbl == MutMutable {
1900+
if mutbl == Mutability::Mutable {
19011901
self.prefer_mutable = true;
19021902
}
19031903
}
@@ -2090,7 +2090,7 @@ impl<'a, 'tcx> Visitor<'tcx> for IncrementVisitor<'a, 'tcx> {
20902090
}
20912091
},
20922092
ExprKind::Assign(ref lhs, _) if lhs.hir_id == expr.hir_id => *state = VarState::DontWarn,
2093-
ExprKind::AddrOf(mutability, _) if mutability == MutMutable => *state = VarState::DontWarn,
2093+
ExprKind::AddrOf(mutability, _) if mutability == Mutability::Mutable => *state = VarState::DontWarn,
20942094
_ => (),
20952095
}
20962096
}
@@ -2172,7 +2172,9 @@ impl<'a, 'tcx> Visitor<'tcx> for InitializeVisitor<'a, 'tcx> {
21722172
VarState::DontWarn
21732173
}
21742174
},
2175-
ExprKind::AddrOf(mutability, _) if mutability == MutMutable => self.state = VarState::DontWarn,
2175+
ExprKind::AddrOf(mutability, _) if mutability == Mutability::Mutable => {
2176+
self.state = VarState::DontWarn
2177+
},
21762178
_ => (),
21772179
}
21782180
}

‎clippy_lints/src/matches.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ fn is_panic_block(block: &Block) -> bool {
570570
fn check_match_ref_pats(cx: &LateContext<'_, '_>, ex: &Expr, arms: &[Arm], expr: &Expr) {
571571
if has_only_ref_pats(arms) {
572572
let mut suggs = Vec::new();
573-
let (title, msg) = if let ExprKind::AddrOf(Mutability::MutImmutable, ref inner) = ex.kind {
573+
let (title, msg) = if let ExprKind::AddrOf(Mutability::Immutable, ref inner) = ex.kind {
574574
let span = ex.span.source_callsite();
575575
suggs.push((span, Sugg::hir_with_macro_callsite(cx, inner, "..").to_string()));
576576
(

‎clippy_lints/src/mem_replace.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::utils::{
22
match_def_path, match_qpath, paths, snippet_with_applicability, span_help_and_lint, span_lint_and_sugg,
33
};
44
use if_chain::if_chain;
5-
use rustc::hir::{Expr, ExprKind, MutMutable, QPath};
5+
use rustc::hir::{Expr, ExprKind, Mutability, QPath};
66
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
77
use rustc::{declare_lint_pass, declare_tool_lint};
88
use rustc_errors::Applicability;
@@ -90,7 +90,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MemReplace {
9090
// argument's type. All that's left is to get
9191
// replacee's path.
9292
let replaced_path = match func_args[0].kind {
93-
ExprKind::AddrOf(MutMutable, ref replaced) => {
93+
ExprKind::AddrOf(Mutability::Mutable, ref replaced) => {
9494
if let ExprKind::Path(QPath::Resolved(None, ref replaced_path)) = replaced.kind {
9595
replaced_path
9696
} else {

‎clippy_lints/src/methods/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2764,8 +2764,8 @@ fn ty_has_iter_method(cx: &LateContext<'_, '_>, self_ref_ty: Ty<'_>) -> Option<(
27642764
_ => unreachable!(),
27652765
};
27662766
let method_name = match mutbl {
2767-
hir::MutImmutable => "iter",
2768-
hir::MutMutable => "iter_mut",
2767+
hir::Mutability::Immutable => "iter",
2768+
hir::Mutability::Mutable => "iter_mut",
27692769
};
27702770
(ty_name, method_name)
27712771
})
@@ -2955,8 +2955,8 @@ impl SelfKind {
29552955
}
29562956

29572957
let trait_path = match mutability {
2958-
hir::Mutability::MutImmutable => &paths::ASREF_TRAIT,
2959-
hir::Mutability::MutMutable => &paths::ASMUT_TRAIT,
2958+
hir::Mutability::Immutable => &paths::ASREF_TRAIT,
2959+
hir::Mutability::Mutable => &paths::ASMUT_TRAIT,
29602960
};
29612961

29622962
let trait_def_id = match get_trait_def_id(cx, trait_path) {
@@ -2969,9 +2969,9 @@ impl SelfKind {
29692969
match self {
29702970
Self::Value => matches_value(parent_ty, ty),
29712971
Self::Ref => {
2972-
matches_ref(cx, hir::Mutability::MutImmutable, parent_ty, ty) || ty == parent_ty && is_copy(cx, ty)
2972+
matches_ref(cx, hir::Mutability::Immutable, parent_ty, ty) || ty == parent_ty && is_copy(cx, ty)
29732973
},
2974-
Self::RefMut => matches_ref(cx, hir::Mutability::MutMutable, parent_ty, ty),
2974+
Self::RefMut => matches_ref(cx, hir::Mutability::Mutable, parent_ty, ty),
29752975
Self::No => ty != parent_ty,
29762976
}
29772977
}

‎clippy_lints/src/misc.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -627,8 +627,8 @@ fn check_cast(cx: &LateContext<'_, '_>, span: Span, e: &Expr, ty: &Ty) {
627627
if !in_constant(cx, e.hir_id);
628628
then {
629629
let (msg, sugg_fn) = match mut_ty.mutbl {
630-
Mutability::MutMutable => ("`0 as *mut _` detected", "std::ptr::null_mut"),
631-
Mutability::MutImmutable => ("`0 as *const _` detected", "std::ptr::null"),
630+
Mutability::Mutable => ("`0 as *mut _` detected", "std::ptr::null_mut"),
631+
Mutability::Immutable => ("`0 as *const _` detected", "std::ptr::null"),
632632
};
633633

634634
let (sugg, appl) = if let TyKind::Infer = mut_ty.ty.kind {

‎clippy_lints/src/mut_mut.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ impl<'a, 'tcx> intravisit::Visitor<'tcx> for MutVisitor<'a, 'tcx> {
5757
// Let's ignore the generated code.
5858
intravisit::walk_expr(self, arg);
5959
intravisit::walk_expr(self, body);
60-
} else if let hir::ExprKind::AddrOf(hir::MutMutable, ref e) = expr.kind {
61-
if let hir::ExprKind::AddrOf(hir::MutMutable, _) = e.kind {
60+
} else if let hir::ExprKind::AddrOf(hir::Mutability::Mutable, ref e) = expr.kind {
61+
if let hir::ExprKind::AddrOf(hir::Mutability::Mutable, _) = e.kind {
6262
span_lint(
6363
self.cx,
6464
MUT_MUT,
6565
expr.span,
6666
"generally you want to avoid `&mut &mut _` if possible",
6767
);
68-
} else if let ty::Ref(_, _, hir::MutMutable) = self.cx.tables.expr_ty(e).kind {
68+
} else if let ty::Ref(_, _, hir::Mutability::Mutable) = self.cx.tables.expr_ty(e).kind {
6969
span_lint(
7070
self.cx,
7171
MUT_MUT,
@@ -81,14 +81,15 @@ impl<'a, 'tcx> intravisit::Visitor<'tcx> for MutVisitor<'a, 'tcx> {
8181
_,
8282
hir::MutTy {
8383
ty: ref pty,
84-
mutbl: hir::MutMutable,
84+
mutbl: hir::Mutability::Mutable,
8585
},
8686
) = ty.kind
8787
{
8888
if let hir::TyKind::Rptr(
8989
_,
9090
hir::MutTy {
91-
mutbl: hir::MutMutable, ..
91+
mutbl: hir::Mutability::Mutable,
92+
..
9293
},
9394
) = pty.kind
9495
{

‎clippy_lints/src/mut_reference.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,12 @@ fn check_arguments<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, arguments: &[Expr], typ
5555
let parameters = type_definition.fn_sig(cx.tcx).skip_binder().inputs();
5656
for (argument, parameter) in arguments.iter().zip(parameters.iter()) {
5757
match parameter.kind {
58-
ty::Ref(_, _, MutImmutable)
58+
ty::Ref(_, _, Mutability::Immutable)
5959
| ty::RawPtr(ty::TypeAndMut {
60-
mutbl: MutImmutable, ..
60+
mutbl: Mutability::Immutable,
61+
..
6162
}) => {
62-
if let ExprKind::AddrOf(MutMutable, _) = argument.kind {
63+
if let ExprKind::AddrOf(Mutability::Mutable, _) = argument.kind {
6364
span_lint(
6465
cx,
6566
UNNECESSARY_MUT_PASSED,

‎clippy_lints/src/mutable_debug_assertion.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,15 @@ impl<'a, 'tcx> MutArgVisitor<'a, 'tcx> {
128128
impl<'a, 'tcx> Visitor<'tcx> for MutArgVisitor<'a, 'tcx> {
129129
fn visit_expr(&mut self, expr: &'tcx Expr) {
130130
match expr.kind {
131-
ExprKind::AddrOf(Mutability::MutMutable, _) => {
131+
ExprKind::AddrOf(Mutability::Mutable, _) => {
132132
self.found = true;
133133
return;
134134
},
135135
ExprKind::Path(_) => {
136136
if let Some(adj) = self.cx.tables.adjustments().get(expr.hir_id) {
137137
if adj
138138
.iter()
139-
.any(|a| matches!(a.target.kind, ty::Ref(_, _, Mutability::MutMutable)))
139+
.any(|a| matches!(a.target.kind, ty::Ref(_, _, Mutability::Mutable)))
140140
{
141141
self.found = true;
142142
return;

‎clippy_lints/src/needless_borrow.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
use crate::utils::{snippet_opt, span_lint_and_then};
66
use if_chain::if_chain;
7-
use rustc::hir::{BindingAnnotation, Expr, ExprKind, HirId, Item, MutImmutable, Pat, PatKind};
7+
use rustc::hir::{BindingAnnotation, Expr, ExprKind, HirId, Item, Mutability, Pat, PatKind};
88
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
99
use rustc::ty;
1010
use rustc::ty::adjustment::{Adjust, Adjustment};
@@ -41,7 +41,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NeedlessBorrow {
4141
if e.span.from_expansion() || self.derived_item.is_some() {
4242
return;
4343
}
44-
if let ExprKind::AddrOf(MutImmutable, ref inner) = e.kind {
44+
if let ExprKind::AddrOf(Mutability::Immutable, ref inner) = e.kind {
4545
if let ty::Ref(..) = cx.tables.expr_ty(inner).kind {
4646
for adj3 in cx.tables.expr_adjustments(e).windows(3) {
4747
if let [Adjustment {
@@ -82,10 +82,10 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NeedlessBorrow {
8282
if_chain! {
8383
if let PatKind::Binding(BindingAnnotation::Ref, .., name, _) = pat.kind;
8484
if let ty::Ref(_, tam, mutbl) = cx.tables.pat_ty(pat).kind;
85-
if mutbl == MutImmutable;
85+
if mutbl == Mutability::Immutable;
8686
if let ty::Ref(_, _, mutbl) = tam.kind;
8787
// only lint immutable refs, because borrowed `&mut T` cannot be moved out
88-
if mutbl == MutImmutable;
88+
if mutbl == Mutability::Immutable;
8989
then {
9090
span_lint_and_then(
9191
cx,

0 commit comments

Comments
 (0)