Skip to content

Commit f694f85

Browse files
borsbors
committed
Auto merge of rust-lang#7254 - Jarcho:needless_borrow_2, r=Manishearth
Move `needless_borrow` to style fixes: rust-lang#3742 rust-lang#7105 should be merged first to fix the false positive. changelog: move `needless_borrow` from `nursery` to `style`
2 parents 029c326 + f355aeb commit f694f85

15 files changed

+164
-173
lines changed

‎clippy_lints/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1361,6 +1361,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
13611361
LintId::of(needless_arbitrary_self_type::NEEDLESS_ARBITRARY_SELF_TYPE),
13621362
LintId::of(needless_bool::BOOL_COMPARISON),
13631363
LintId::of(needless_bool::NEEDLESS_BOOL),
1364+
LintId::of(needless_borrow::NEEDLESS_BORROW),
13641365
LintId::of(needless_borrowed_ref::NEEDLESS_BORROWED_REFERENCE),
13651366
LintId::of(needless_question_mark::NEEDLESS_QUESTION_MARK),
13661367
LintId::of(needless_update::NEEDLESS_UPDATE),
@@ -1544,6 +1545,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
15441545
LintId::of(misc_early::REDUNDANT_PATTERN),
15451546
LintId::of(mut_mutex_lock::MUT_MUTEX_LOCK),
15461547
LintId::of(mut_reference::UNNECESSARY_MUT_PASSED),
1548+
LintId::of(needless_borrow::NEEDLESS_BORROW),
15471549
LintId::of(neg_multiply::NEG_MULTIPLY),
15481550
LintId::of(new_without_default::NEW_WITHOUT_DEFAULT),
15491551
LintId::of(non_copy_const::BORROW_INTERIOR_MUTABLE_CONST),
@@ -1783,7 +1785,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
17831785
LintId::of(missing_const_for_fn::MISSING_CONST_FOR_FN),
17841786
LintId::of(mutable_debug_assertion::DEBUG_ASSERT_WITH_MUT_CALL),
17851787
LintId::of(mutex_atomic::MUTEX_INTEGER),
1786-
LintId::of(needless_borrow::NEEDLESS_BORROW),
17871788
LintId::of(path_buf_push_overwrite::PATH_BUF_PUSH_OVERWRITE),
17881789
LintId::of(redundant_pub_crate::REDUNDANT_PUB_CRATE),
17891790
LintId::of(regex::TRIVIAL_REGEX),

‎clippy_lints/src/needless_borrow.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ declare_clippy_lint! {
3434
/// let x: &i32 = &5;
3535
/// ```
3636
pub NEEDLESS_BORROW,
37-
nursery,
37+
style,
3838
"taking a reference that is going to be automatically dereferenced"
3939
}
4040

‎clippy_lints/src/ptr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ fn check_invalid_ptr_usage<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
211211
];
212212

213213
if_chain! {
214-
if let ExprKind::Call(ref fun, ref args) = expr.kind;
214+
if let ExprKind::Call(fun, args) = expr.kind;
215215
if let ExprKind::Path(ref qpath) = fun.kind;
216216
if let Some(fun_def_id) = cx.qpath_res(qpath, fun.hir_id).opt_def_id();
217217
let fun_def_path = cx.get_def_path(fun_def_id).into_iter().map(Symbol::to_ident_string).collect::<Vec<_>>();

‎clippy_lints/src/single_component_path_imports.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ fn check_mod(cx: &EarlyContext<'_>, items: &[P<Item>]) {
7070
for item in items {
7171
track_uses(
7272
cx,
73-
&item,
73+
item,
7474
&mut imports_reused_with_self,
7575
&mut single_use_usages,
7676
&mut macros,
@@ -117,7 +117,7 @@ fn track_uses(
117117

118118
match &item.kind {
119119
ItemKind::Mod(_, ModKind::Loaded(ref items, ..)) => {
120-
check_mod(cx, &items);
120+
check_mod(cx, items);
121121
},
122122
ItemKind::MacroDef(MacroDef { macro_rules: true, .. }) => {
123123
macros.push(item.ident.name);

‎clippy_lints/src/unused_io_amount.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ impl<'tcx> LateLintPass<'tcx> for UnusedIoAmount {
6666

6767
fn check_map_error(cx: &LateContext<'_>, call: &hir::Expr<'_>, expr: &hir::Expr<'_>) {
6868
let mut call = call;
69-
while let hir::ExprKind::MethodCall(ref path, _, ref args, _) = call.kind {
69+
while let hir::ExprKind::MethodCall(path, _, args, _) = call.kind {
7070
if matches!(&*path.ident.as_str(), "or" | "or_else" | "ok") {
7171
call = &args[0];
7272
} else {

‎clippy_lints/src/utils/internal_lints/metadata_collector.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ impl<'hir> LateLintPass<'hir> for MetadataCollector {
379379
/// }
380380
/// ```
381381
fn check_item(&mut self, cx: &LateContext<'hir>, item: &'hir Item<'_>) {
382-
if let ItemKind::Static(ref ty, Mutability::Not, _) = item.kind {
382+
if let ItemKind::Static(ty, Mutability::Not, _) = item.kind {
383383
// Normal lint
384384
if_chain! {
385385
// item validation
@@ -489,7 +489,7 @@ fn extract_attr_docs(cx: &LateContext<'_>, item: &Item<'_>) -> Option<String> {
489489
.hir()
490490
.attrs(item.hir_id())
491491
.iter()
492-
.filter_map(|ref x| x.doc_str().map(|sym| sym.as_str().to_string()))
492+
.filter_map(|x| x.doc_str().map(|sym| sym.as_str().to_string()))
493493
.reduce(|mut acc, sym| {
494494
acc.push_str(&sym);
495495
acc.push('\n');
@@ -596,7 +596,7 @@ fn extract_emission_info<'hir>(
596596
let mut multi_part = false;
597597

598598
for arg in args {
599-
let (arg_ty, _) = walk_ptrs_ty_depth(cx.typeck_results().expr_ty(&arg));
599+
let (arg_ty, _) = walk_ptrs_ty_depth(cx.typeck_results().expr_ty(arg));
600600

601601
if match_type(cx, arg_ty, &paths::LINT) {
602602
// If we found the lint arg, extract the lint name
@@ -671,7 +671,7 @@ impl<'a, 'hir> intravisit::Visitor<'hir> for LintResolver<'a, 'hir> {
671671
if let ExprKind::Path(qpath) = &expr.kind;
672672
if let QPath::Resolved(_, path) = qpath;
673673

674-
let (expr_ty, _) = walk_ptrs_ty_depth(self.cx.typeck_results().expr_ty(&expr));
674+
let (expr_ty, _) = walk_ptrs_ty_depth(self.cx.typeck_results().expr_ty(expr));
675675
if match_type(self.cx, expr_ty, &paths::LINT);
676676
then {
677677
if let hir::def::Res::Def(DefKind::Static, _) = path.res {
@@ -730,7 +730,7 @@ impl<'a, 'hir> intravisit::Visitor<'hir> for ApplicabilityResolver<'a, 'hir> {
730730
}
731731

732732
fn visit_expr(&mut self, expr: &'hir hir::Expr<'hir>) {
733-
let (expr_ty, _) = walk_ptrs_ty_depth(self.cx.typeck_results().expr_ty(&expr));
733+
let (expr_ty, _) = walk_ptrs_ty_depth(self.cx.typeck_results().expr_ty(expr));
734734

735735
if_chain! {
736736
if match_type(self.cx, expr_ty, &paths::APPLICABILITY);

‎clippy_utils/src/consts.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -229,25 +229,25 @@ impl<'a, 'tcx> ConstEvalLateContext<'a, 'tcx> {
229229
pub fn expr(&mut self, e: &Expr<'_>) -> Option<Constant> {
230230
match e.kind {
231231
ExprKind::Path(ref qpath) => self.fetch_path(qpath, e.hir_id, self.typeck_results.expr_ty(e)),
232-
ExprKind::Block(ref block, _) => self.block(block),
232+
ExprKind::Block(block, _) => self.block(block),
233233
ExprKind::Lit(ref lit) => Some(lit_to_constant(&lit.node, self.typeck_results.expr_ty_opt(e))),
234-
ExprKind::Array(ref vec) => self.multi(vec).map(Constant::Vec),
235-
ExprKind::Tup(ref tup) => self.multi(tup).map(Constant::Tuple),
236-
ExprKind::Repeat(ref value, _) => {
234+
ExprKind::Array(vec) => self.multi(vec).map(Constant::Vec),
235+
ExprKind::Tup(tup) => self.multi(tup).map(Constant::Tuple),
236+
ExprKind::Repeat(value, _) => {
237237
let n = match self.typeck_results.expr_ty(e).kind() {
238238
ty::Array(_, n) => n.try_eval_usize(self.lcx.tcx, self.lcx.param_env)?,
239239
_ => span_bug!(e.span, "typeck error"),
240240
};
241241
self.expr(value).map(|v| Constant::Repeat(Box::new(v), n))
242242
},
243-
ExprKind::Unary(op, ref operand) => self.expr(operand).and_then(|o| match op {
243+
ExprKind::Unary(op, operand) => self.expr(operand).and_then(|o| match op {
244244
UnOp::Not => self.constant_not(&o, self.typeck_results.expr_ty(e)),
245245
UnOp::Neg => self.constant_negate(&o, self.typeck_results.expr_ty(e)),
246246
UnOp::Deref => Some(if let Constant::Ref(r) = o { *r } else { o }),
247247
}),
248-
ExprKind::If(ref cond, ref then, ref otherwise) => self.ifthenelse(cond, then, *otherwise),
249-
ExprKind::Binary(op, ref left, ref right) => self.binop(op, left, right),
250-
ExprKind::Call(ref callee, ref args) => {
248+
ExprKind::If(cond, then, ref otherwise) => self.ifthenelse(cond, then, *otherwise),
249+
ExprKind::Binary(op, left, right) => self.binop(op, left, right),
250+
ExprKind::Call(callee, args) => {
251251
// We only handle a few const functions for now.
252252
if_chain! {
253253
if args.is_empty();
@@ -273,8 +273,8 @@ impl<'a, 'tcx> ConstEvalLateContext<'a, 'tcx> {
273273
}
274274
}
275275
},
276-
ExprKind::Index(ref arr, ref index) => self.index(arr, index),
277-
ExprKind::AddrOf(_, _, ref inner) => self.expr(inner).map(|r| Constant::Ref(Box::new(r))),
276+
ExprKind::Index(arr, index) => self.index(arr, index),
277+
ExprKind::AddrOf(_, _, inner) => self.expr(inner).map(|r| Constant::Ref(Box::new(r))),
278278
// TODO: add other expressions.
279279
_ => None,
280280
}
@@ -349,7 +349,7 @@ impl<'a, 'tcx> ConstEvalLateContext<'a, 'tcx> {
349349
)
350350
.ok()
351351
.map(|val| rustc_middle::ty::Const::from_value(self.lcx.tcx, val, ty))?;
352-
let result = miri_to_const(&result);
352+
let result = miri_to_const(result);
353353
if result.is_some() {
354354
self.needed_resolution = true;
355355
}

‎clippy_utils/src/higher.rs

+18-18
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pub fn range<'a>(expr: &'a hir::Expr<'_>) -> Option<Range<'a>> {
5858
}
5959

6060
match expr.kind {
61-
hir::ExprKind::Call(ref path, ref args)
61+
hir::ExprKind::Call(path, args)
6262
if matches!(
6363
path.kind,
6464
hir::ExprKind::Path(hir::QPath::LangItem(hir::LangItem::RangeInclusiveNew, _))
@@ -70,7 +70,7 @@ pub fn range<'a>(expr: &'a hir::Expr<'_>) -> Option<Range<'a>> {
7070
limits: ast::RangeLimits::Closed,
7171
})
7272
},
73-
hir::ExprKind::Struct(path, ref fields, None) => match path {
73+
hir::ExprKind::Struct(path, fields, None) => match path {
7474
hir::QPath::LangItem(hir::LangItem::RangeFull, _) => Some(Range {
7575
start: None,
7676
end: None,
@@ -112,7 +112,7 @@ pub fn is_from_for_desugar(local: &hir::Local<'_>) -> bool {
112112
// }
113113
// ```
114114
if_chain! {
115-
if let Some(ref expr) = local.init;
115+
if let Some(expr) = local.init;
116116
if let hir::ExprKind::Match(_, _, hir::MatchSource::ForLoopDesugar) = expr.kind;
117117
then {
118118
return true;
@@ -140,14 +140,14 @@ pub fn for_loop<'tcx>(
140140
expr: &'tcx hir::Expr<'tcx>,
141141
) -> Option<(&hir::Pat<'_>, &'tcx hir::Expr<'tcx>, &'tcx hir::Expr<'tcx>, Span)> {
142142
if_chain! {
143-
if let hir::ExprKind::Match(ref iterexpr, ref arms, hir::MatchSource::ForLoopDesugar) = expr.kind;
144-
if let hir::ExprKind::Call(_, ref iterargs) = iterexpr.kind;
143+
if let hir::ExprKind::Match(iterexpr, arms, hir::MatchSource::ForLoopDesugar) = expr.kind;
144+
if let hir::ExprKind::Call(_, iterargs) = iterexpr.kind;
145145
if iterargs.len() == 1 && arms.len() == 1 && arms[0].guard.is_none();
146-
if let hir::ExprKind::Loop(ref block, ..) = arms[0].body.kind;
146+
if let hir::ExprKind::Loop(block, ..) = arms[0].body.kind;
147147
if block.expr.is_none();
148148
if let [ _, _, ref let_stmt, ref body ] = *block.stmts;
149-
if let hir::StmtKind::Local(ref local) = let_stmt.kind;
150-
if let hir::StmtKind::Expr(ref expr) = body.kind;
149+
if let hir::StmtKind::Local(local) = let_stmt.kind;
150+
if let hir::StmtKind::Expr(expr) = body.kind;
151151
then {
152152
return Some((&*local.pat, &iterargs[0], expr, arms[0].span));
153153
}
@@ -182,7 +182,7 @@ pub enum VecArgs<'a> {
182182
/// from `vec!`.
183183
pub fn vec_macro<'e>(cx: &LateContext<'_>, expr: &'e hir::Expr<'_>) -> Option<VecArgs<'e>> {
184184
if_chain! {
185-
if let hir::ExprKind::Call(ref fun, ref args) = expr.kind;
185+
if let hir::ExprKind::Call(fun, args) = expr.kind;
186186
if let hir::ExprKind::Path(ref qpath) = fun.kind;
187187
if is_expn_of(fun.span, "vec").is_some();
188188
if let Some(fun_def_id) = cx.qpath_res(qpath, fun.hir_id).opt_def_id();
@@ -194,8 +194,8 @@ pub fn vec_macro<'e>(cx: &LateContext<'_>, expr: &'e hir::Expr<'_>) -> Option<Ve
194194
else if match_def_path(cx, fun_def_id, &paths::SLICE_INTO_VEC) && args.len() == 1 {
195195
// `vec![a, b, c]` case
196196
if_chain! {
197-
if let hir::ExprKind::Box(ref boxed) = args[0].kind;
198-
if let hir::ExprKind::Array(ref args) = boxed.kind;
197+
if let hir::ExprKind::Box(boxed) = args[0].kind;
198+
if let hir::ExprKind::Array(args) = boxed.kind;
199199
then {
200200
return Some(VecArgs::Vec(&*args));
201201
}
@@ -227,7 +227,7 @@ pub fn extract_assert_macro_args<'tcx>(e: &'tcx Expr<'tcx>) -> Option<Vec<&'tcx
227227
/// compared
228228
fn ast_matchblock(matchblock_expr: &'tcx Expr<'tcx>) -> Option<Vec<&Expr<'_>>> {
229229
if_chain! {
230-
if let ExprKind::Match(ref headerexpr, _, _) = &matchblock_expr.kind;
230+
if let ExprKind::Match(headerexpr, _, _) = &matchblock_expr.kind;
231231
if let ExprKind::Tup([lhs, rhs]) = &headerexpr.kind;
232232
if let ExprKind::AddrOf(BorrowKind::Ref, _, lhs) = lhs.kind;
233233
if let ExprKind::AddrOf(BorrowKind::Ref, _, rhs) = rhs.kind;
@@ -238,12 +238,12 @@ pub fn extract_assert_macro_args<'tcx>(e: &'tcx Expr<'tcx>) -> Option<Vec<&'tcx
238238
None
239239
}
240240

241-
if let ExprKind::Block(ref block, _) = e.kind {
241+
if let ExprKind::Block(block, _) = e.kind {
242242
if block.stmts.len() == 1 {
243-
if let StmtKind::Semi(ref matchexpr) = block.stmts.get(0)?.kind {
243+
if let StmtKind::Semi(matchexpr) = block.stmts.get(0)?.kind {
244244
// macros with unique arg: `{debug_}assert!` (e.g., `debug_assert!(some_condition)`)
245245
if_chain! {
246-
if let ExprKind::If(ref clause, _, _) = matchexpr.kind;
246+
if let ExprKind::If(clause, _, _) = matchexpr.kind;
247247
if let ExprKind::Unary(UnOp::Not, condition) = clause.kind;
248248
then {
249249
return Some(vec![condition]);
@@ -252,16 +252,16 @@ pub fn extract_assert_macro_args<'tcx>(e: &'tcx Expr<'tcx>) -> Option<Vec<&'tcx
252252

253253
// debug macros with two args: `debug_assert_{ne, eq}` (e.g., `assert_ne!(a, b)`)
254254
if_chain! {
255-
if let ExprKind::Block(ref matchblock,_) = matchexpr.kind;
256-
if let Some(ref matchblock_expr) = matchblock.expr;
255+
if let ExprKind::Block(matchblock,_) = matchexpr.kind;
256+
if let Some(matchblock_expr) = matchblock.expr;
257257
then {
258258
return ast_matchblock(matchblock_expr);
259259
}
260260
}
261261
}
262262
} else if let Some(matchblock_expr) = block.expr {
263263
// macros with two args: `assert_{ne, eq}` (e.g., `assert_ne!(a, b)`)
264-
return ast_matchblock(&matchblock_expr);
264+
return ast_matchblock(matchblock_expr);
265265
}
266266
}
267267
None

0 commit comments

Comments
 (0)