Merge #1482

1482: Some clippy fixes for 1.36 r=kjeremy a=kjeremy

Some clippy fixes now that 1.36 is released. ~~Plus the requisite format run (I can rebase after #1481 is merged to make this cleaner) .~~

The change from `map(|it| *it)` to `copied()` changes the minimum rust stable to 1.36.


Co-authored-by: Jeremy Kolb <[email protected]>

2 files changed, 2 insertions, 2 deletions

diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index 74b7efa9a..08e5c1c32 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -191,7 +191,7 @@ impl ProjectWorkspace {
                     }
                 }
 
-                let libstd = sysroot.std().and_then(|it| sysroot_crates.get(&it).map(|&it| it));
+                let libstd = sysroot.std().and_then(|it| sysroot_crates.get(&it).copied());
 
                 let mut pkg_to_lib_crate = FxHashMap::default();
                 let mut pkg_crates = FxHashMap::default();
diff --git a/crates/ra_project_model/src/sysroot.rs b/crates/ra_project_model/src/sysroot.rs
index a419b81e8..4f6e880dd 100644
--- a/crates/ra_project_model/src/sysroot.rs
+++ b/crates/ra_project_model/src/sysroot.rs
@@ -94,7 +94,7 @@ impl SysrootCrate {
         self.root(sysroot).parent().unwrap()
     }
     pub fn deps<'a>(self, sysroot: &'a Sysroot) -> impl Iterator<Item = SysrootCrate> + 'a {
-        sysroot.crates[self].deps.iter().map(|&it| it)
+        sysroot.crates[self].deps.iter().copied()
     }
 }