Skip to content

Commit 14a4e3b

Browse files
committed
Fix a lint message
1 parent 1543e11 commit 14a4e3b

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

clippy_lints/src/loops.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ use crate::utils::paths;
33
use crate::utils::sugg::Sugg;
44
use crate::utils::usage::{is_unused, mutated_variables};
55
use crate::utils::{
6-
get_enclosing_block, get_parent_expr, get_trait_def_id, has_iter_method, higher, implements_trait,
7-
is_integer_const, is_no_std_crate, is_refutable, is_type_diagnostic_item, last_path_segment, match_trait_method,
8-
match_type, match_var, multispan_sugg, qpath_res, snippet, snippet_opt, snippet_with_applicability, span_lint,
6+
get_enclosing_block, get_parent_expr, get_trait_def_id, has_iter_method, higher,
7+
implements_trait, is_integer_const, is_no_std_crate, is_refutable, is_type_diagnostic_item,
8+
last_path_segment, match_trait_method, match_type, match_var, multispan_sugg, qpath_res,
9+
snippet, snippet_opt, snippet_with_applicability, snippet_with_macro_callsite, span_lint,
910
span_lint_and_help, span_lint_and_sugg, span_lint_and_then, sugg, SpanlessEq,
1011
};
1112
use if_chain::if_chain;
@@ -1262,8 +1263,8 @@ fn detect_same_item_push<'tcx>(
12621263
walk_expr(&mut for_pat_visitor, pushed_item);
12631264

12641265
if !for_pat_visitor.found_pattern {
1265-
let vec_str = snippet(cx, vec.span, "");
1266-
let item_str = snippet(cx, pushed_item.span, "");
1266+
let vec_str = snippet_with_macro_callsite(cx, vec.span, "");
1267+
let item_str = snippet_with_macro_callsite(cx, pushed_item.span, "");
12671268

12681269
span_lint_and_help(
12691270
cx,

tests/ui/same_item_push.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LL | spaces.push(vec![b' ']);
55
| ^^^^^^
66
|
77
= note: `-D clippy::same-item-push` implied by `-D warnings`
8-
= help: try using vec![<[_]>::into_vec(box [$($x),+]);SIZE] or spaces.resize(NEW_SIZE, <[_]>::into_vec(box [$($x),+]))
8+
= help: try using vec![vec![b' '];SIZE] or spaces.resize(NEW_SIZE, vec![b' '])
99

1010
error: it looks like the same item is being pushed into this Vec
1111
--> $DIR/same_item_push.rs:22:9

0 commit comments

Comments
 (0)