Skip to content

Commit af09bf9

Browse files
committed
53692: Addressed Estebank's Nits
1 parent a673203 commit af09bf9

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

src/librustc_typeck/check/mod.rs

+7-5
Original file line numberDiff line numberDiff line change
@@ -4726,13 +4726,15 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
47264726
if receiver.ends_with(&method_call) {
47274727
None // do not suggest code that is already there (#53348)
47284728
} else {
4729-
// methods defined will be overwrite `.clone()`
4730-
// if suggesion is present in `method_call_list` (#53692)
4729+
/*
4730+
methods defined in `method_call_list` will overwrite
4731+
`.clone()` in copy of `receiver`
4732+
*/
47314733
let method_call_list = [".to_vec()", ".to_string()"];
4732-
if receiver.ends_with("clone()")
4734+
if receiver.ends_with(".clone()")
47334735
&& method_call_list.contains(&method_call.as_str()){
4734-
// needed to clone receiver, because we don't want other
4735-
// suggestion to get affect because of that
4736+
// created copy of `receiver` because we don't want other
4737+
// suggestion to get affected
47364738
let mut new_receiver = receiver.clone();
47374739
let max_len = new_receiver.rfind(".").unwrap();
47384740
new_receiver.truncate(max_len);

src/test/ui/issue-53692.rs

+7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ fn main() {
1212
let ref_items: &[i32] = &items;
1313
let items_clone: Vec<i32> = ref_items.clone();
1414

15+
// in that case no suggestion will be triggered
16+
let items_clone_2:Vec<i32> = items.clone();
17+
1518
let s = "hi";
1619
let string: String = s.clone();
20+
21+
// in that case no suggestion will be triggered
22+
let s2 = "hi";
23+
let string_2: String = s2.to_string();
1724
}

src/test/ui/issue-53692.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LL | let items_clone: Vec<i32> = ref_items.clone();
1111
found type `&[i32]`
1212

1313
error[E0308]: mismatched types
14-
--> $DIR/issue-53692.rs:16:30
14+
--> $DIR/issue-53692.rs:19:30
1515
|
1616
LL | let string: String = s.clone();
1717
| ^^^^^^^^^

0 commit comments

Comments
 (0)