Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix redundant_clone lint not working with PathBuf and OsString #5017

Merged
merged 1 commit into from
Jan 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions clippy_lints/src/redundant_clone.rs
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,13 @@ fn find_stmt_assigns_to<'tcx>(
(true, mir::Rvalue::Ref(_, _, place)) | (false, mir::Rvalue::Use(mir::Operand::Copy(place))) => {
base_local_and_movability(cx, mir, place)
},
(false, mir::Rvalue::Ref(_, _, place)) => {
if let [mir::ProjectionElem::Deref] = place.as_ref().projection {
base_local_and_movability(cx, mir, place)
} else {
None
}
},
_ => None,
}
}
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/redundant_clone.fixed
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ fn main() {

let _s = Path::new("/a/b/").join("c");

let _s = Path::new("/a/b/").join("c").to_path_buf();
let _s = Path::new("/a/b/").join("c");

let _s = OsString::new();

let _s = OsString::new().to_os_string();
let _s = OsString::new();

// Check that lint level works
#[allow(clippy::redundant_clone)]
Expand Down
26 changes: 25 additions & 1 deletion tests/ui/redundant_clone.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,18 @@ note: this value is dropped without further use
LL | let _s = Path::new("/a/b/").join("c").to_owned();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: redundant clone
--> $DIR/redundant_clone.rs:21:42
|
LL | let _s = Path::new("/a/b/").join("c").to_path_buf();
| ^^^^^^^^^^^^^^ help: remove this
|
note: this value is dropped without further use
--> $DIR/redundant_clone.rs:21:14
|
LL | let _s = Path::new("/a/b/").join("c").to_path_buf();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: redundant clone
--> $DIR/redundant_clone.rs:23:29
|
Expand All @@ -71,6 +83,18 @@ note: this value is dropped without further use
LL | let _s = OsString::new().to_owned();
| ^^^^^^^^^^^^^^^

error: redundant clone
--> $DIR/redundant_clone.rs:25:29
|
LL | let _s = OsString::new().to_os_string();
| ^^^^^^^^^^^^^^^ help: remove this
|
note: this value is dropped without further use
--> $DIR/redundant_clone.rs:25:14
|
LL | let _s = OsString::new().to_os_string();
| ^^^^^^^^^^^^^^^

error: redundant clone
--> $DIR/redundant_clone.rs:32:19
|
Expand Down Expand Up @@ -131,5 +155,5 @@ note: this value is dropped without further use
LL | let _f = f.clone();
| ^

error: aborting due to 11 previous errors
error: aborting due to 13 previous errors