Auto merge of #7911 - aleksator:run_through_clippy, r=ehuss

Clean up code mostly based on clippy suggestions

Author: bors

crates/cargo-platform/src/lib.rs

@@ -84,16 +84,14 @@ impl Platform {
                             )),
                         _ => (),
                     },
-                    Cfg::KeyPair(name, _) => match name.as_str() {
-                        "feature" =>
-                            warnings.push(String::from(
-                                "Found `feature = ...` in `target.'cfg(...)'.dependencies`. \
-                                 This key is not supported for selecting dependencies \
-                                 and will not work as expected. \
-                                 Use the [features] section instead: \
-                                 https://doc.rust-lang.org/cargo/reference/features.html"
-                            )),
-                        _ => (),
+                    Cfg::KeyPair(name, _) => if name.as_str() == "feature" {
+                        warnings.push(String::from(
+                            "Found `feature = ...` in `target.'cfg(...)'.dependencies`. \
+                             This key is not supported for selecting dependencies \
+                             and will not work as expected. \
+                             Use the [features] section instead: \
+                             https://doc.rust-lang.org/cargo/reference/features.html"
+                        ))
                     },
                 }
             }

crates/crates-io/lib.rs

@@ -11,7 +11,6 @@ use anyhow::{bail, Result};
 use curl::easy::{Easy, List};
 use percent_encoding::{percent_encode, NON_ALPHANUMERIC};
 use serde::{Deserialize, Serialize};
-use serde_json;
 use url::Url;
 
 pub struct Registry {

src/bin/cargo/cli.rs

@@ -1,9 +1,6 @@
-use clap;
-
-use clap::{AppSettings, Arg, ArgMatches};
-
 use cargo::core::features;
 use cargo::{self, CliResult, Config};
+use clap::{AppSettings, Arg, ArgMatches};
 
 use super::commands;
 use super::list_commands;
@@ -155,7 +152,7 @@ fn expand_aliases(
                 // capture those global options now.
                 // Note that an alias to an external command will not receive
                 // these arguments. That may be confusing, but such is life.
-                let global_args = GlobalArgs::new(&args);
+                let global_args = GlobalArgs::new(args);
                 let new_args = cli()
                     .setting(AppSettings::NoBinaryName)
                     .get_matches_from_safe(alias)?;

src/cargo/core/compiler/context/compilation_files.rs

@@ -271,8 +271,7 @@ impl<'a, 'cfg: 'a> CompilationFiles<'a, 'cfg> {
 
         let file_type = file_types
             .iter()
-            .filter(|file_type| file_type.flavor == FileFlavor::Normal)
-            .next()
+            .find(|file_type| file_type.flavor == FileFlavor::Normal)
             .expect("target must support `bin`");
 
         Ok(dest.join(file_type.filename(target.name())))

src/cargo/core/compiler/unit_dependencies.rs

@@ -267,10 +267,7 @@ fn compute_deps<'a, 'cfg>(
             // If this is an optional dependency, and the new feature resolver
             // did not enable it, don't include it.
             if dep.is_optional() {
-                let features_for = match unit_for.is_for_build_dep() {
-                    true => FeaturesFor::BuildDep,
-                    false => FeaturesFor::NormalOrDev,
-                };
+                let features_for = unit_for.map_to_features_for();
 
                 let feats = state.activated_features(id, features_for);
                 if !feats.contains(&dep.name_in_toml()) {
@@ -627,10 +624,7 @@ fn new_unit_dep_with_profile<'a>(
     let public = state
         .resolve()
         .is_public_dep(parent.pkg.package_id(), pkg.package_id());
-    let features_for = match unit_for.is_for_build_dep() {
-        true => FeaturesFor::BuildDep,
-        false => FeaturesFor::NormalOrDev,
-    };
+    let features_for = unit_for.map_to_features_for();
     let features = state.activated_features(pkg.package_id(), features_for);
     let unit = state
         .bcx

src/cargo/core/package_id.rs

@@ -6,7 +6,6 @@ use std::path::Path;
 use std::ptr;
 use std::sync::Mutex;
 
-use semver;
 use serde::de;
 use serde::ser;
 

src/cargo/core/profiles.rs

@@ -1,5 +1,6 @@
 use crate::core::compiler::CompileMode;
 use crate::core::interning::InternedString;
+use crate::core::resolver::features::FeaturesFor;
 use crate::core::{Feature, Features, PackageId, PackageIdSpec, Resolve, Shell};
 use crate::util::errors::CargoResultExt;
 use crate::util::toml::{ProfilePackageSpec, StringOrBool, TomlProfile, TomlProfiles, U32OrBool};
@@ -975,6 +976,14 @@ impl UnitFor {
         ];
         ALL
     }
+
+    pub(crate) fn map_to_features_for(&self) -> FeaturesFor {
+        if self.is_for_build_dep() {
+            FeaturesFor::BuildDep
+        } else {
+            FeaturesFor::NormalOrDev
+        }
+    }
 }
 
 /// Takes the manifest profiles, and overlays the config profiles on-top.

src/cargo/core/resolver/errors.rs

@@ -4,7 +4,6 @@ use crate::core::{Dependency, PackageId, Registry, Summary};
 use crate::util::lev_distance::lev_distance;
 use crate::util::Config;
 use anyhow::Error;
-use semver;
 
 use super::context::Context;
 use super::types::{ConflictMap, ConflictReason};

src/cargo/core/resolver/resolve.rs

@@ -385,8 +385,7 @@ impl PartialEq for Resolve {
     fn eq(&self, other: &Resolve) -> bool {
         macro_rules! compare {
             ($($fields:ident)* | $($ignored:ident)*) => {
-                let Resolve { $($fields,)* $($ignored,)* } = self;
-                $(drop($ignored);)*
+                let Resolve { $($fields,)* $($ignored: _,)* } = self;
                 $($fields == &other.$fields)&&*
             }
         }

src/cargo/core/resolver/types.rs

@@ -3,7 +3,6 @@ use crate::core::interning::InternedString;
 use crate::core::{Dependency, PackageId, Summary};
 use crate::util::errors::CargoResult;
 use crate::util::Config;
-use im_rc;
 use std::cmp::Ordering;
 use std::collections::{BTreeMap, BTreeSet};
 use std::ops::Range;