some clippy things

Author: Eh2406

src/cargo/core/compiler/fingerprint.rs

@@ -478,9 +478,7 @@ enum LocalFingerprint {
     /// The `dep_info` file, when present, also lists a number of other files
     /// for us to look at. If any of those files are newer than this file then
     /// we need to recompile.
-    CheckDepInfo {
-        dep_info: PathBuf,
-    },
+    CheckDepInfo { dep_info: PathBuf },
 
     /// This represents a nonempty set of `rerun-if-changed` annotations printed
     /// out by a build script. The `output` file is a arelative file anchored at
@@ -500,10 +498,7 @@ enum LocalFingerprint {
     /// build script. The exact env var and value are hashed here. There's no
     /// filesystem dependence here, and if the values are changed the hash will
     /// change forcing a recompile.
-    RerunIfEnvChanged {
-        var: String,
-        val: Option<String>,
-    },
+    RerunIfEnvChanged { var: String, val: Option<String> },
 }
 
 enum StaleFile {
@@ -762,7 +757,7 @@ impl Fingerprint {
                     let t = FileTime::from_system_time(SystemTime::now());
                     drop(filetime::set_file_times(f, t, t));
                 }
-                return mtime;
+                mtime
             })
             .min();
 
@@ -1350,7 +1345,7 @@ fn compare_old_fingerprint(
     debug_assert_eq!(util::to_hex(old_fingerprint.hash()), old_fingerprint_short);
     let result = new_fingerprint.compare(&old_fingerprint);
     assert!(result.is_err());
-    return result;
+    result
 }
 
 fn log_compare(unit: &Unit<'_>, compare: &CargoResult<()>) {
@@ -1444,7 +1439,7 @@ where
         });
     }
 
-    return None;
+    None
 }
 
 fn filename<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> String {

src/cargo/core/resolver/conflict_cache.rs

@@ -234,7 +234,7 @@ impl ConflictCache {
     /// all the `PackageId` entries are activated.
     pub fn contains(&self, dep: &Dependency, con: &ConflictMap) -> bool {
         if let Some(cst) = self.con_from_dep.get(dep) {
-            cst.contains(con.keys().cloned(), &con)
+            cst.contains(con.keys().cloned(), con)
         } else {
             false
         }

src/cargo/core/resolver/context.rs

@@ -77,7 +77,7 @@ impl From<&semver::Version> for SemverCompatibility {
 }
 
 impl PackageId {
-    pub fn as_activations_key(&self) -> (InternedString, SourceId, SemverCompatibility) {
+    pub fn as_activations_key(self) -> (InternedString, SourceId, SemverCompatibility) {
         (self.name(), self.source_id(), self.version().into())
     }
 }
@@ -304,17 +304,12 @@ impl Context {
 
         // Record what list of features is active for this package.
         if !reqs.used.is_empty() {
-            let pkgid = s.package_id();
-
-            let set = Rc::make_mut(
+            Rc::make_mut(
                 self.resolve_features
-                    .entry(pkgid)
-                    .or_insert_with(|| Rc::new(HashSet::new())),
-            );
-
-            for feature in reqs.used {
-                set.insert(feature);
-            }
+                    .entry(s.package_id())
+                    .or_insert_with(|| Rc::new(HashSet::with_capacity(reqs.used.len()))),
+            )
+            .extend(reqs.used);
         }
 
         Ok(ret)
@@ -411,7 +406,7 @@ struct Requirements<'a> {
     visited: HashSet<InternedString>,
 }
 
-impl<'r> Requirements<'r> {
+impl Requirements<'_> {
     fn new(summary: &Summary) -> Requirements<'_> {
         Requirements {
             summary,
@@ -468,7 +463,7 @@ impl<'r> Requirements<'r> {
         Ok(())
     }
 
-    fn require_value<'f>(&mut self, fv: &'f FeatureValue) -> CargoResult<()> {
+    fn require_value(&mut self, fv: &FeatureValue) -> CargoResult<()> {
         match fv {
             FeatureValue::Feature(feat) => self.require_feature(*feat)?,
             FeatureValue::Crate(dep) => self.require_dependency(*dep),

src/cargo/core/resolver/mod.rs

@@ -883,7 +883,7 @@ fn generalize_conflicting(
             // Thus, if all the things it can resolve to have already ben determined
             // to be conflicting, then we can just say that we conflict with the parent.
             if registry
-                .query(&critical_parents_dep)
+                .query(critical_parents_dep)
                 .expect("an already used dep now error!?")
                 .iter()
                 .rev() // the last one to be tried is the least likely to be in the cache, so start with that.
@@ -894,13 +894,13 @@ fn generalize_conflicting(
                         other.summary.package_id(),
                         backtrack_critical_reason.clone(),
                     );
-                    past_conflicting_activations.contains(&dep, &con)
+                    past_conflicting_activations.contains(dep, &con)
                 })
             {
                 let mut con = conflicting_activations.clone();
                 con.remove(&backtrack_critical_id);
                 con.insert(*critical_parent, backtrack_critical_reason);
-                past_conflicting_activations.insert(&dep, &con);
+                past_conflicting_activations.insert(dep, &con);
                 return Some(con);
             }
         }

src/cargo/ops/cargo_install.rs

@@ -461,10 +461,7 @@ fn install_one(
         let mut pkg_map = BTreeMap::new();
         for (bin_name, opt_pkg_id) in &duplicates {
             let key = opt_pkg_id.map_or_else(|| "unknown".to_string(), |pkg_id| pkg_id.to_string());
-            pkg_map
-                .entry(key)
-                .or_insert_with(|| Vec::new())
-                .push(bin_name);
+            pkg_map.entry(key).or_insert_with(Vec::new).push(bin_name);
         }
         for (pkg_descr, bin_names) in &pkg_map {
             config.shell().status(

src/cargo/sources/registry/index.rs

@@ -269,10 +269,10 @@ impl<'cfg> RegistryIndex<'cfg> {
         yanked_whitelist: &HashSet<PackageId>,
         f: &mut dyn FnMut(Summary),
     ) -> CargoResult<()> {
-        if self.config.cli_unstable().offline {
-            if self.query_inner_with_online(dep, load, yanked_whitelist, f, false)? != 0 {
-                return Ok(());
-            }
+        if self.config.cli_unstable().offline
+            && self.query_inner_with_online(dep, load, yanked_whitelist, f, false)? != 0
+        {
+            return Ok(());
             // If offline, and there are no matches, try again with online.
             // This is necessary for dependencies that are not used (such as
             // target-cfg or optional), but are not downloaded. Normally the