Skip to content

Commit bc77f0b

Browse files
JarchoJarcho
committed
Move needless_borrow from the nursery. The bug that moved it there was fixed over two years ago in d4370f8.
1 parent 4d68619 commit bc77f0b

File tree

183 files changed

+2320
-2343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+2320
-2343
lines changed

‎clippy_dev/src/fmt.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pub fn run(check: bool, verbose: bool) {
6868
continue;
6969
}
7070

71-
success &= rustfmt(context, &path)?;
71+
success &= rustfmt(context, path)?;
7272
}
7373

7474
Ok(success)

‎clippy_dev/src/lib.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ impl Lint {
101101
#[must_use]
102102
pub fn gen_lint_group_list<'a>(lints: impl Iterator<Item = &'a Lint>) -> Vec<String> {
103103
lints
104-
.map(|l| format!(" LintId::of(&{}::{}),", l.module, l.name.to_uppercase()))
104+
.map(|l| format!(" LintId::of({}::{}),", l.module, l.name.to_uppercase()))
105105
.sorted()
106106
.collect::<Vec<String>>()
107107
}
@@ -154,17 +154,17 @@ pub fn gen_register_lint_list<'a>(
154154
let header = " store.register_lints(&[".to_string();
155155
let footer = " ]);".to_string();
156156
let internal_lints = internal_lints
157-
.sorted_by_key(|l| format!(" &{}::{},", l.module, l.name.to_uppercase()))
157+
.sorted_by_key(|l| format!(" {}::{},", l.module, l.name.to_uppercase()))
158158
.map(|l| {
159159
format!(
160-
" #[cfg(feature = \"internal-lints\")]\n &{}::{},",
160+
" #[cfg(feature = \"internal-lints\")]\n {}::{},",
161161
l.module,
162162
l.name.to_uppercase()
163163
)
164164
});
165165
let other_lints = usable_lints
166-
.sorted_by_key(|l| format!(" &{}::{},", l.module, l.name.to_uppercase()))
167-
.map(|l| format!(" &{}::{},", l.module, l.name.to_uppercase()))
166+
.sorted_by_key(|l| format!(" {}::{},", l.module, l.name.to_uppercase()))
167+
.map(|l| format!(" {}::{},", l.module, l.name.to_uppercase()))
168168
.sorted();
169169
let mut lint_list = vec![header];
170170
lint_list.extend(internal_lints);
@@ -550,9 +550,9 @@ fn test_gen_lint_group_list() {
550550
Lint::new("internal", "internal_style", "abc", None, "module_name"),
551551
];
552552
let expected = vec![
553-
" LintId::of(&module_name::ABC),".to_string(),
554-
" LintId::of(&module_name::INTERNAL),".to_string(),
555-
" LintId::of(&module_name::SHOULD_ASSERT_EQ),".to_string(),
553+
" LintId::of(module_name::ABC),".to_string(),
554+
" LintId::of(module_name::INTERNAL),".to_string(),
555+
" LintId::of(module_name::SHOULD_ASSERT_EQ),".to_string(),
556556
];
557557
assert_eq!(expected, gen_lint_group_list(lints.iter()));
558558
}

‎clippy_lints/src/assertions_on_constants.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ impl<'tcx> LateLintPass<'tcx> for AssertionsOnConstants {
7171
return;
7272
}
7373
if_chain! {
74-
if let ExprKind::Unary(_, ref lit) = e.kind;
74+
if let ExprKind::Unary(_, lit) = e.kind;
7575
if let Some((Constant::Bool(is_true), _)) = constant(cx, cx.typeck_results(), lit);
7676
if is_true;
7777
then {
@@ -82,7 +82,7 @@ impl<'tcx> LateLintPass<'tcx> for AssertionsOnConstants {
8282
if assert_span.from_expansion() {
8383
return;
8484
}
85-
if let Some(assert_match) = match_assert_with_message(&cx, e) {
85+
if let Some(assert_match) = match_assert_with_message(cx, e) {
8686
match assert_match {
8787
// matched assert but not message
8888
AssertKind::WithoutMessage(false) => lint_false_without_message(),
@@ -113,17 +113,17 @@ enum AssertKind {
113113
/// where `message` is any expression and `c` is a constant bool.
114114
fn match_assert_with_message<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) -> Option<AssertKind> {
115115
if_chain! {
116-
if let ExprKind::If(ref cond, ref then, _) = expr.kind;
117-
if let ExprKind::Unary(UnOp::Not, ref expr) = cond.kind;
116+
if let ExprKind::If(cond, then, _) = expr.kind;
117+
if let ExprKind::Unary(UnOp::Not, expr) = cond.kind;
118118
// bind the first argument of the `assert!` macro
119119
if let Some((Constant::Bool(is_true), _)) = constant(cx, cx.typeck_results(), expr);
120120
// block
121-
if let ExprKind::Block(ref block, _) = then.kind;
121+
if let ExprKind::Block(block, _) = then.kind;
122122
if block.stmts.is_empty();
123123
if let Some(block_expr) = &block.expr;
124124
// inner block is optional. unwrap it if it exists, or use the expression as is otherwise.
125125
if let Some(begin_panic_call) = match block_expr.kind {
126-
ExprKind::Block(ref inner_block, _) => &inner_block.expr,
126+
ExprKind::Block(inner_block, _) => &inner_block.expr,
127127
_ => &block.expr,
128128
};
129129
// function call

‎clippy_lints/src/atomic_ordering.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ fn match_ordering_def_path(cx: &LateContext<'_>, did: DefId, orderings: &[&str])
8585

8686
fn check_atomic_load_store(cx: &LateContext<'_>, expr: &Expr<'_>) {
8787
if_chain! {
88-
if let ExprKind::MethodCall(ref method_path, _, args, _) = &expr.kind;
88+
if let ExprKind::MethodCall(method_path, _, args, _) = &expr.kind;
8989
let method = method_path.ident.name.as_str();
9090
if type_is_atomic(cx, &args[0]);
9191
if method == "load" || method == "store";
@@ -120,7 +120,7 @@ fn check_atomic_load_store(cx: &LateContext<'_>, expr: &Expr<'_>) {
120120

121121
fn check_memory_fence(cx: &LateContext<'_>, expr: &Expr<'_>) {
122122
if_chain! {
123-
if let ExprKind::Call(ref func, ref args) = expr.kind;
123+
if let ExprKind::Call(func, args) = expr.kind;
124124
if let ExprKind::Path(ref func_qpath) = func.kind;
125125
if let Some(def_id) = cx.qpath_res(func_qpath, func.hir_id).opt_def_id();
126126
if ["fence", "compiler_fence"]
@@ -152,7 +152,7 @@ fn opt_ordering_defid(cx: &LateContext<'_>, ord_arg: &Expr<'_>) -> Option<DefId>
152152

153153
fn check_atomic_compare_exchange(cx: &LateContext<'_>, expr: &Expr<'_>) {
154154
if_chain! {
155-
if let ExprKind::MethodCall(ref method_path, _, args, _) = &expr.kind;
155+
if let ExprKind::MethodCall(method_path, _, args, _) = &expr.kind;
156156
let method = method_path.ident.name.as_str();
157157
if type_is_atomic(cx, &args[0]);
158158
if method == "compare_exchange" || method == "compare_exchange_weak" || method == "fetch_update";

‎clippy_lints/src/attrs.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ fn check_mismatched_target_os(cx: &EarlyContext<'_>, attr: &Attribute) {
602602
if let NestedMetaItem::MetaItem(meta) = item {
603603
match &meta.kind {
604604
MetaItemKind::List(list) => {
605-
mismatched.extend(find_mismatched_target_os(&list));
605+
mismatched.extend(find_mismatched_target_os(list));
606606
},
607607
MetaItemKind::Word => {
608608
if_chain! {
@@ -629,7 +629,7 @@ fn check_mismatched_target_os(cx: &EarlyContext<'_>, attr: &Attribute) {
629629
then {
630630
let mess = "operating system used in target family position";
631631

632-
span_lint_and_then(cx, MISMATCHED_TARGET_OS, attr.span, &mess, |diag| {
632+
span_lint_and_then(cx, MISMATCHED_TARGET_OS, attr.span, mess, |diag| {
633633
// Avoid showing the unix suggestion multiple times in case
634634
// we have more than one mismatch for unix-like systems
635635
let mut unix_suggested = false;

‎clippy_lints/src/await_holding_invalid.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ impl LateLintPass<'_> for AwaitHolding {
101101
let typeck_results = cx.tcx.typeck_body(body_id);
102102
check_interior_types(
103103
cx,
104-
&typeck_results.generator_interior_types.as_ref().skip_binder(),
104+
typeck_results.generator_interior_types.as_ref().skip_binder(),
105105
body.value.span,
106106
);
107107
}

‎clippy_lints/src/bytecount.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@ declare_lint_pass!(ByteCount => [NAIVE_BYTECOUNT]);
3838
impl<'tcx> LateLintPass<'tcx> for ByteCount {
3939
fn check_expr(&mut self, cx: &LateContext<'_>, expr: &Expr<'_>) {
4040
if_chain! {
41-
if let ExprKind::MethodCall(ref count, _, ref count_args, _) = expr.kind;
41+
if let ExprKind::MethodCall(count, _, count_args, _) = expr.kind;
4242
if count.ident.name == sym!(count);
4343
if count_args.len() == 1;
44-
if let ExprKind::MethodCall(ref filter, _, ref filter_args, _) = count_args[0].kind;
44+
if let ExprKind::MethodCall(filter, _, filter_args, _) = count_args[0].kind;
4545
if filter.ident.name == sym!(filter);
4646
if filter_args.len() == 2;
4747
if let ExprKind::Closure(_, _, body_id, _, _) = filter_args[1].kind;
4848
then {
4949
let body = cx.tcx.hir().body(body_id);
5050
if_chain! {
5151
if body.params.len() == 1;
52-
if let Some(argname) = get_pat_name(&body.params[0].pat);
53-
if let ExprKind::Binary(ref op, ref l, ref r) = body.value.kind;
52+
if let Some(argname) = get_pat_name(body.params[0].pat);
53+
if let ExprKind::Binary(op, l, r) = body.value.kind;
5454
if op.node == BinOpKind::Eq;
5555
if match_type(cx,
5656
cx.typeck_results().expr_ty(&filter_args[0]).peel_refs(),
@@ -66,7 +66,7 @@ impl<'tcx> LateLintPass<'tcx> for ByteCount {
6666
if ty::Uint(UintTy::U8) != *cx.typeck_results().expr_ty(needle).peel_refs().kind() {
6767
return;
6868
}
69-
let haystack = if let ExprKind::MethodCall(ref path, _, ref args, _) =
69+
let haystack = if let ExprKind::MethodCall(path, _, args, _) =
7070
filter_args[0].kind {
7171
let p = path.ident.name;
7272
if (p == sym::iter || p == sym!(iter_mut)) && args.len() == 1 {
@@ -102,10 +102,10 @@ fn check_arg(name: Symbol, arg: Symbol, needle: &Expr<'_>) -> bool {
102102

103103
fn get_path_name(expr: &Expr<'_>) -> Option<Symbol> {
104104
match expr.kind {
105-
ExprKind::Box(ref e) | ExprKind::AddrOf(BorrowKind::Ref, _, ref e) | ExprKind::Unary(UnOp::Deref, ref e) => {
105+
ExprKind::Box(e) | ExprKind::AddrOf(BorrowKind::Ref, _, e) | ExprKind::Unary(UnOp::Deref, e) => {
106106
get_path_name(e)
107107
},
108-
ExprKind::Block(ref b, _) => {
108+
ExprKind::Block(b, _) => {
109109
if b.stmts.is_empty() {
110110
b.expr.as_ref().and_then(|p| get_path_name(p))
111111
} else {

‎clippy_lints/src/casts/cast_ptr_alignment.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use rustc_target::abi::LayoutOf;
1010
use super::CAST_PTR_ALIGNMENT;
1111

1212
pub(super) fn check(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
13-
if let ExprKind::Cast(ref cast_expr, cast_to) = expr.kind {
13+
if let ExprKind::Cast(cast_expr, cast_to) = expr.kind {
1414
if is_hir_ty_cfg_dependant(cx, cast_to) {
1515
return;
1616
}

‎clippy_lints/src/casts/cast_sign_loss.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fn should_lint(cx: &LateContext<'_>, cast_op: &Expr<'_>, cast_from: Ty<'_>, cast
3030
}
3131

3232
// Don't lint for positive constants.
33-
let const_val = constant(cx, &cx.typeck_results(), cast_op);
33+
let const_val = constant(cx, cx.typeck_results(), cast_op);
3434
if_chain! {
3535
if let Some((Constant::Int(n), _)) = const_val;
3636
if let ty::Int(ity) = *cast_from.kind();
@@ -41,14 +41,14 @@ fn should_lint(cx: &LateContext<'_>, cast_op: &Expr<'_>, cast_from: Ty<'_>, cast
4141
}
4242

4343
// Don't lint for the result of methods that always return non-negative values.
44-
if let ExprKind::MethodCall(ref path, _, _, _) = cast_op.kind {
44+
if let ExprKind::MethodCall(path, _, _, _) = cast_op.kind {
4545
let mut method_name = path.ident.name.as_str();
4646
let allowed_methods = ["abs", "checked_abs", "rem_euclid", "checked_rem_euclid"];
4747

4848
if_chain! {
4949
if method_name == "unwrap";
5050
if let Some(arglist) = method_chain_args(cast_op, &["unwrap"]);
51-
if let ExprKind::MethodCall(ref inner_path, _, _, _) = &arglist[0][0].kind;
51+
if let ExprKind::MethodCall(inner_path, _, _, _) = &arglist[0][0].kind;
5252
then {
5353
method_name = inner_path.ident.name.as_str();
5454
}

‎clippy_lints/src/casts/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ impl<'tcx> LateLintPass<'tcx> for Casts {
372372
return;
373373
}
374374

375-
if let ExprKind::Cast(ref cast_expr, cast_to) = expr.kind {
375+
if let ExprKind::Cast(cast_expr, cast_to) = expr.kind {
376376
if is_hir_ty_cfg_dependant(cx, cast_to) {
377377
return;
378378
}

0 commit comments

Comments
 (0)