mirror of
https://github.com/rust-lang/rust-clippy
synced 2025-02-17 14:38:46 +00:00
needless borrows found in clippy
This commit is contained in:
parent
87faaec7a3
commit
6edc6a13d4
18 changed files with 35 additions and 35 deletions
|
@ -67,7 +67,7 @@ impl LateLintPass for ArrayIndexing {
|
||||||
let size = ConstInt::Infer(size as u64);
|
let size = ConstInt::Infer(size as u64);
|
||||||
|
|
||||||
// Index is a constant uint
|
// Index is a constant uint
|
||||||
let const_index = eval_const_expr_partial(cx.tcx, &index, ExprTypeChecked, None);
|
let const_index = eval_const_expr_partial(cx.tcx, index, ExprTypeChecked, None);
|
||||||
if let Ok(ConstVal::Integral(const_index)) = const_index {
|
if let Ok(ConstVal::Integral(const_index)) = const_index {
|
||||||
if size <= const_index {
|
if size <= const_index {
|
||||||
utils::span_lint(cx, OUT_OF_BOUNDS_INDEXING, e.span, "const index is out of bounds");
|
utils::span_lint(cx, OUT_OF_BOUNDS_INDEXING, e.span, "const index is out of bounds");
|
||||||
|
|
|
@ -59,7 +59,7 @@ impl<'v> Visitor<'v> for ExVisitor<'v> {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
if complex {
|
if complex {
|
||||||
self.found_block = Some(&expr);
|
self.found_block = Some(expr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -221,7 +221,7 @@ fn suggest(cx: &LateContext, suggestion: &Bool, terminals: &[&Expr]) -> String {
|
||||||
s.push('(');
|
s.push('(');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
s.push_str(&snip(&terminals[n as usize]));
|
s.push_str(&snip(terminals[n as usize]));
|
||||||
if brackets {
|
if brackets {
|
||||||
if let ExprBinary(..) = terminals[n as usize].node {
|
if let ExprBinary(..) = terminals[n as usize].node {
|
||||||
s.push(')');
|
s.push(')');
|
||||||
|
@ -319,7 +319,7 @@ impl<'a, 'tcx> NonminimalBoolVisitor<'a, 'tcx> {
|
||||||
}
|
}
|
||||||
let mut improvements = Vec::new();
|
let mut improvements = Vec::new();
|
||||||
'simplified: for suggestion in &simplified {
|
'simplified: for suggestion in &simplified {
|
||||||
let simplified_stats = terminal_stats(&suggestion);
|
let simplified_stats = terminal_stats(suggestion);
|
||||||
let mut improvement = false;
|
let mut improvement = false;
|
||||||
for i in 0..32 {
|
for i in 0..32 {
|
||||||
// ignore any "simplifications" that end up requiring a terminal more often than in the original expression
|
// ignore any "simplifications" that end up requiring a terminal more often than in the original expression
|
||||||
|
|
|
@ -164,7 +164,7 @@ impl PartialOrd for Constant {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
(&Constant::Bool(ref l), &Constant::Bool(ref r)) => Some(l.cmp(r)),
|
(&Constant::Bool(ref l), &Constant::Bool(ref r)) => Some(l.cmp(r)),
|
||||||
(&Constant::Vec(ref l), &Constant::Vec(ref r)) => l.partial_cmp(&r),
|
(&Constant::Vec(ref l), &Constant::Vec(ref r)) => l.partial_cmp(r),
|
||||||
(&Constant::Repeat(ref lv, ref ls), &Constant::Repeat(ref rv, ref rs)) => {
|
(&Constant::Repeat(ref lv, ref ls), &Constant::Repeat(ref rv, ref rs)) => {
|
||||||
match lv.partial_cmp(rv) {
|
match lv.partial_cmp(rv) {
|
||||||
Some(Equal) => Some(ls.cmp(rs)),
|
Some(Equal) => Some(ls.cmp(rs)),
|
||||||
|
|
|
@ -142,7 +142,7 @@ fn lint_match_arms(cx: &LateContext, expr: &Expr) {
|
||||||
};
|
};
|
||||||
|
|
||||||
if let ExprMatch(_, ref arms, MatchSource::Normal) = expr.node {
|
if let ExprMatch(_, ref arms, MatchSource::Normal) = expr.node {
|
||||||
if let Some((i, j)) = search_same(&arms, hash, eq) {
|
if let Some((i, j)) = search_same(arms, hash, eq) {
|
||||||
span_note_and_lint(cx,
|
span_note_and_lint(cx,
|
||||||
MATCH_SAME_ARMS,
|
MATCH_SAME_ARMS,
|
||||||
j.body.span,
|
j.body.span,
|
||||||
|
@ -256,8 +256,8 @@ fn search_same<T, Hash, Eq>(exprs: &[T], hash: Hash, eq: Eq) -> Option<(&T, &T)>
|
||||||
match map.entry(hash(expr)) {
|
match map.entry(hash(expr)) {
|
||||||
Entry::Occupied(o) => {
|
Entry::Occupied(o) => {
|
||||||
for o in o.get() {
|
for o in o.get() {
|
||||||
if eq(&o, expr) {
|
if eq(o, expr) {
|
||||||
return Some((&o, expr));
|
return Some((o, expr));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,7 +58,7 @@ impl CyclomaticComplexity {
|
||||||
divergence: 0,
|
divergence: 0,
|
||||||
short_circuits: 0,
|
short_circuits: 0,
|
||||||
returns: 0,
|
returns: 0,
|
||||||
tcx: &cx.tcx,
|
tcx: cx.tcx,
|
||||||
};
|
};
|
||||||
helper.visit_block(block);
|
helper.visit_block(block);
|
||||||
let CCHelper { match_arms, divergence, short_circuits, returns, .. } = helper;
|
let CCHelper { match_arms, divergence, short_circuits, returns, .. } = helper;
|
||||||
|
|
|
@ -68,9 +68,9 @@ impl EarlyLintPass for EnumVariantNames {
|
||||||
for var in &def.variants {
|
for var in &def.variants {
|
||||||
let name = var2str(var);
|
let name = var2str(var);
|
||||||
|
|
||||||
let pre_match = partial_match(&pre, &name);
|
let pre_match = partial_match(pre, &name);
|
||||||
pre = &pre[..pre_match];
|
pre = &pre[..pre_match];
|
||||||
let pre_camel = camel_case_until(&pre);
|
let pre_camel = camel_case_until(pre);
|
||||||
pre = &pre[..pre_camel];
|
pre = &pre[..pre_camel];
|
||||||
while let Some((next, last)) = name[pre.len()..].chars().zip(pre.chars().rev()).next() {
|
while let Some((next, last)) = name[pre.len()..].chars().zip(pre.chars().rev()).next() {
|
||||||
if next.is_lowercase() {
|
if next.is_lowercase() {
|
||||||
|
@ -82,10 +82,10 @@ impl EarlyLintPass for EnumVariantNames {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let post_match = partial_rmatch(&post, &name);
|
let post_match = partial_rmatch(post, &name);
|
||||||
let post_end = post.len() - post_match;
|
let post_end = post.len() - post_match;
|
||||||
post = &post[post_end..];
|
post = &post[post_end..];
|
||||||
let post_camel = camel_case_from(&post);
|
let post_camel = camel_case_from(post);
|
||||||
post = &post[post_camel..];
|
post = &post[post_camel..];
|
||||||
}
|
}
|
||||||
let (what, value) = match (pre.is_empty(), post.is_empty()) {
|
let (what, value) = match (pre.is_empty(), post.is_empty()) {
|
||||||
|
|
|
@ -184,7 +184,7 @@ fn has_is_empty(cx: &LateContext, expr: &Expr) -> bool {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
let ty = &walk_ptrs_ty(&cx.tcx.expr_ty(expr));
|
let ty = &walk_ptrs_ty(cx.tcx.expr_ty(expr));
|
||||||
match ty.sty {
|
match ty.sty {
|
||||||
ty::TyTrait(_) => {
|
ty::TyTrait(_) => {
|
||||||
cx.tcx
|
cx.tcx
|
||||||
|
|
|
@ -141,7 +141,7 @@ pub fn plugin_registrar(reg: &mut Registry) {
|
||||||
("clippy.toml", false)
|
("clippy.toml", false)
|
||||||
};
|
};
|
||||||
|
|
||||||
let (conf, errors) = utils::conf::read_conf(&file_name, must_exist);
|
let (conf, errors) = utils::conf::read_conf(file_name, must_exist);
|
||||||
|
|
||||||
// all conf errors are non-fatal, we just use the default conf in case of error
|
// all conf errors are non-fatal, we just use the default conf in case of error
|
||||||
for error in errors {
|
for error in errors {
|
||||||
|
|
|
@ -46,7 +46,7 @@ impl LintPass for LifetimePass {
|
||||||
impl LateLintPass for LifetimePass {
|
impl LateLintPass for LifetimePass {
|
||||||
fn check_item(&mut self, cx: &LateContext, item: &Item) {
|
fn check_item(&mut self, cx: &LateContext, item: &Item) {
|
||||||
if let ItemFn(ref decl, _, _, _, ref generics, _) = item.node {
|
if let ItemFn(ref decl, _, _, _, ref generics, _) = item.node {
|
||||||
check_fn_inner(cx, decl, None, &generics, item.span);
|
check_fn_inner(cx, decl, None, generics, item.span);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -102,7 +102,7 @@ fn check_fn_inner(cx: &LateContext, decl: &FnDecl, slf: Option<&ExplicitSelf>, g
|
||||||
span,
|
span,
|
||||||
"explicit lifetimes given in parameter types where they could be elided");
|
"explicit lifetimes given in parameter types where they could be elided");
|
||||||
}
|
}
|
||||||
report_extra_lifetimes(cx, decl, &generics, slf);
|
report_extra_lifetimes(cx, decl, generics, slf);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn could_use_elision<'a, T: Iterator<Item = &'a Lifetime>>(cx: &LateContext, func: &FnDecl, slf: Option<&ExplicitSelf>,
|
fn could_use_elision<'a, T: Iterator<Item = &'a Lifetime>>(cx: &LateContext, func: &FnDecl, slf: Option<&ExplicitSelf>,
|
||||||
|
|
10
src/loops.rs
10
src/loops.rs
|
@ -328,7 +328,7 @@ fn check_for_loop(cx: &LateContext, pat: &Pat, arg: &Expr, body: &Expr, expr: &E
|
||||||
/// Check for looping over a range and then indexing a sequence with it.
|
/// Check for looping over a range and then indexing a sequence with it.
|
||||||
/// The iteratee must be a range literal.
|
/// The iteratee must be a range literal.
|
||||||
fn check_for_loop_range(cx: &LateContext, pat: &Pat, arg: &Expr, body: &Expr, expr: &Expr) {
|
fn check_for_loop_range(cx: &LateContext, pat: &Pat, arg: &Expr, body: &Expr, expr: &Expr) {
|
||||||
if let Some(UnsugaredRange { start: Some(ref start), ref end, .. }) = unsugar_range(&arg) {
|
if let Some(UnsugaredRange { start: Some(ref start), ref end, .. }) = unsugar_range(arg) {
|
||||||
// the var must be a single name
|
// the var must be a single name
|
||||||
if let PatKind::Ident(_, ref ident, _) = pat.node {
|
if let PatKind::Ident(_, ref ident, _) = pat.node {
|
||||||
let mut visitor = VarVisitor {
|
let mut visitor = VarVisitor {
|
||||||
|
@ -363,7 +363,7 @@ fn check_for_loop_range(cx: &LateContext, pat: &Pat, arg: &Expr, body: &Expr, ex
|
||||||
};
|
};
|
||||||
|
|
||||||
let take: Cow<_> = if let Some(ref end) = *end {
|
let take: Cow<_> = if let Some(ref end) = *end {
|
||||||
if is_len_call(&end, &indexed) {
|
if is_len_call(end, &indexed) {
|
||||||
"".into()
|
"".into()
|
||||||
} else {
|
} else {
|
||||||
format!(".take({})", snippet(cx, end.span, "..")).into()
|
format!(".take({})", snippet(cx, end.span, "..")).into()
|
||||||
|
@ -422,10 +422,10 @@ fn is_len_call(expr: &Expr, var: &Name) -> bool {
|
||||||
|
|
||||||
fn check_for_loop_reverse_range(cx: &LateContext, arg: &Expr, expr: &Expr) {
|
fn check_for_loop_reverse_range(cx: &LateContext, arg: &Expr, expr: &Expr) {
|
||||||
// if this for loop is iterating over a two-sided range...
|
// if this for loop is iterating over a two-sided range...
|
||||||
if let Some(UnsugaredRange { start: Some(ref start), end: Some(ref end), limits }) = unsugar_range(&arg) {
|
if let Some(UnsugaredRange { start: Some(ref start), end: Some(ref end), limits }) = unsugar_range(arg) {
|
||||||
// ...and both sides are compile-time constant integers...
|
// ...and both sides are compile-time constant integers...
|
||||||
if let Ok(start_idx) = eval_const_expr_partial(&cx.tcx, start, ExprTypeChecked, None) {
|
if let Ok(start_idx) = eval_const_expr_partial(cx.tcx, start, ExprTypeChecked, None) {
|
||||||
if let Ok(end_idx) = eval_const_expr_partial(&cx.tcx, end, ExprTypeChecked, None) {
|
if let Ok(end_idx) = eval_const_expr_partial(cx.tcx, end, ExprTypeChecked, None) {
|
||||||
// ...and the start index is greater than the end index,
|
// ...and the start index is greater than the end index,
|
||||||
// this loop will never run. This is often confusing for developers
|
// this loop will never run. This is often confusing for developers
|
||||||
// who think that this will iterate from the larger value to the
|
// who think that this will iterate from the larger value to the
|
||||||
|
|
|
@ -461,8 +461,8 @@ pub fn overlapping<T>(ranges: &[SpannedRange<T>]) -> Option<(&SpannedRange<T>, &
|
||||||
let mut values = Vec::with_capacity(2 * ranges.len());
|
let mut values = Vec::with_capacity(2 * ranges.len());
|
||||||
|
|
||||||
for r in ranges {
|
for r in ranges {
|
||||||
values.push(Kind::Start(r.node.0, &r));
|
values.push(Kind::Start(r.node.0, r));
|
||||||
values.push(Kind::End(r.node.1, &r));
|
values.push(Kind::End(r.node.1, r));
|
||||||
}
|
}
|
||||||
|
|
||||||
values.sort();
|
values.sort();
|
||||||
|
@ -475,7 +475,7 @@ pub fn overlapping<T>(ranges: &[SpannedRange<T>]) -> Option<(&SpannedRange<T>, &
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
(&Kind::End(a, _), &Kind::Start(b, _)) if a != b => (),
|
(&Kind::End(a, _), &Kind::Start(b, _)) if a != b => (),
|
||||||
_ => return Some((&a.range(), &b.range())),
|
_ => return Some((a.range(), b.range())),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -365,7 +365,7 @@ impl LateLintPass for MethodsPass {
|
||||||
lint_cstring_as_ptr(cx, expr, &arglists[0][0], &arglists[1][0]);
|
lint_cstring_as_ptr(cx, expr, &arglists[0][0], &arglists[1][0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
lint_or_fun_call(cx, expr, &name.node.as_str(), &args);
|
lint_or_fun_call(cx, expr, &name.node.as_str(), args);
|
||||||
|
|
||||||
let self_ty = cx.tcx.expr_ty_adjusted(&args[0]);
|
let self_ty = cx.tcx.expr_ty_adjusted(&args[0]);
|
||||||
if args.len() == 1 && name.node.as_str() == "clone" {
|
if args.len() == 1 && name.node.as_str() == "clone" {
|
||||||
|
@ -420,7 +420,7 @@ impl LateLintPass for MethodsPass {
|
||||||
|
|
||||||
// check conventions w.r.t. conversion method names and predicates
|
// check conventions w.r.t. conversion method names and predicates
|
||||||
let ty = cx.tcx.lookup_item_type(cx.tcx.map.local_def_id(item.id)).ty;
|
let ty = cx.tcx.lookup_item_type(cx.tcx.map.local_def_id(item.id)).ty;
|
||||||
let is_copy = is_copy(cx, &ty, &item);
|
let is_copy = is_copy(cx, ty, item);
|
||||||
for &(ref conv, self_kinds) in &CONVENTIONS {
|
for &(ref conv, self_kinds) in &CONVENTIONS {
|
||||||
if conv.check(&name.as_str()) &&
|
if conv.check(&name.as_str()) &&
|
||||||
!self_kinds.iter().any(|k| k.matches(&sig.explicit_self.node, is_copy)) {
|
!self_kinds.iter().any(|k| k.matches(&sig.explicit_self.node, is_copy)) {
|
||||||
|
|
|
@ -424,7 +424,7 @@ fn is_used(cx: &LateContext, expr: &Expr) -> bool {
|
||||||
match parent.node {
|
match parent.node {
|
||||||
ExprAssign(_, ref rhs) |
|
ExprAssign(_, ref rhs) |
|
||||||
ExprAssignOp(_, _, ref rhs) => **rhs == *expr,
|
ExprAssignOp(_, _, ref rhs) => **rhs == *expr,
|
||||||
_ => is_used(cx, &parent),
|
_ => is_used(cx, parent),
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
true
|
true
|
||||||
|
|
|
@ -39,13 +39,13 @@ impl LateLintPass for UnnecessaryMutPassed {
|
||||||
If this happened, the compiler would have \
|
If this happened, the compiler would have \
|
||||||
aborted the compilation long ago");
|
aborted the compilation long ago");
|
||||||
if let ExprPath(_, ref path) = fn_expr.node {
|
if let ExprPath(_, ref path) = fn_expr.node {
|
||||||
check_arguments(cx, &arguments, function_type, &path.to_string());
|
check_arguments(cx, arguments, function_type, &path.to_string());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ExprMethodCall(ref name, _, ref arguments) => {
|
ExprMethodCall(ref name, _, ref arguments) => {
|
||||||
let method_call = MethodCall::expr(e.id);
|
let method_call = MethodCall::expr(e.id);
|
||||||
let method_type = borrowed_table.method_map.get(&method_call).expect("This should never happen.");
|
let method_type = borrowed_table.method_map.get(&method_call).expect("This should never happen.");
|
||||||
check_arguments(cx, &arguments, method_type.ty, &name.node.as_str())
|
check_arguments(cx, arguments, method_type.ty, &name.node.as_str())
|
||||||
}
|
}
|
||||||
_ => (),
|
_ => (),
|
||||||
}
|
}
|
||||||
|
|
|
@ -249,7 +249,7 @@ impl EarlyLintPass for NonExpressiveNames {
|
||||||
let mut visitor = SimilarNamesLocalVisitor {
|
let mut visitor = SimilarNamesLocalVisitor {
|
||||||
names: Vec::new(),
|
names: Vec::new(),
|
||||||
cx: cx,
|
cx: cx,
|
||||||
lint: &self,
|
lint: self,
|
||||||
single_char_names: Vec::new(),
|
single_char_names: Vec::new(),
|
||||||
};
|
};
|
||||||
// initialize with function arguments
|
// initialize with function arguments
|
||||||
|
|
|
@ -278,7 +278,7 @@ fn check_expr(cx: &LateContext, expr: &Expr, bindings: &mut Vec<(Name, Span)>) {
|
||||||
let len = bindings.len();
|
let len = bindings.len();
|
||||||
for ref arm in arms {
|
for ref arm in arms {
|
||||||
for ref pat in &arm.pats {
|
for ref pat in &arm.pats {
|
||||||
check_pat(cx, &pat, &Some(&**init), pat.span, bindings);
|
check_pat(cx, pat, &Some(&**init), pat.span, bindings);
|
||||||
// This is ugly, but needed to get the right type
|
// This is ugly, but needed to get the right type
|
||||||
if let Some(ref guard) = arm.guard {
|
if let Some(ref guard) = arm.guard {
|
||||||
check_expr(cx, guard, bindings);
|
check_expr(cx, guard, bindings);
|
||||||
|
|
|
@ -910,7 +910,7 @@ fn upcast_comparison_bounds_err(cx: &LateContext, span: &Span, rel: comparisons:
|
||||||
if let Some(norm_rhs_val) = node_as_const_fullint(cx, rhs) {
|
if let Some(norm_rhs_val) = node_as_const_fullint(cx, rhs) {
|
||||||
if rel == Rel::Eq || rel == Rel::Ne {
|
if rel == Rel::Eq || rel == Rel::Ne {
|
||||||
if norm_rhs_val < lb || norm_rhs_val > ub {
|
if norm_rhs_val < lb || norm_rhs_val > ub {
|
||||||
err_upcast_comparison(cx, &span, lhs, rel == Rel::Ne);
|
err_upcast_comparison(cx, span, lhs, rel == Rel::Ne);
|
||||||
}
|
}
|
||||||
} else if match rel {
|
} else if match rel {
|
||||||
Rel::Lt => {
|
Rel::Lt => {
|
||||||
|
@ -929,7 +929,7 @@ fn upcast_comparison_bounds_err(cx: &LateContext, span: &Span, rel: comparisons:
|
||||||
}
|
}
|
||||||
Rel::Eq | Rel::Ne => unreachable!(),
|
Rel::Eq | Rel::Ne => unreachable!(),
|
||||||
} {
|
} {
|
||||||
err_upcast_comparison(cx, &span, lhs, true)
|
err_upcast_comparison(cx, span, lhs, true)
|
||||||
} else if match rel {
|
} else if match rel {
|
||||||
Rel::Lt => {
|
Rel::Lt => {
|
||||||
if invert {
|
if invert {
|
||||||
|
@ -947,7 +947,7 @@ fn upcast_comparison_bounds_err(cx: &LateContext, span: &Span, rel: comparisons:
|
||||||
}
|
}
|
||||||
Rel::Eq | Rel::Ne => unreachable!(),
|
Rel::Eq | Rel::Ne => unreachable!(),
|
||||||
} {
|
} {
|
||||||
err_upcast_comparison(cx, &span, lhs, false)
|
err_upcast_comparison(cx, span, lhs, false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue