Skip to content

Commit 2b1dc3e

Browse files
aleksatoraleksator
committed
Run through nightly clippy
1 parent 45ad3f9 commit 2b1dc3e

File tree

13 files changed

+49
-55
lines changed

13 files changed

+49
-55
lines changed

‎crates/cargo-platform/src/lib.rs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,14 @@ impl Platform {
8484
)),
8585
_ => (),
8686
},
87-
Cfg::KeyPair(name, _) => match name.as_str() {
88-
"feature" =>
89-
warnings.push(String::from(
90-
"Found `feature = ...` in `target.'cfg(...)'.dependencies`. \
91-
This key is not supported for selecting dependencies \
92-
and will not work as expected. \
93-
Use the [features] section instead: \
94-
https://doc.rust-lang.org/cargo/reference/features.html"
95-
)),
96-
_ => (),
87+
Cfg::KeyPair(name, _) => if name.as_str() == "feature" {
88+
warnings.push(String::from(
89+
"Found `feature = ...` in `target.'cfg(...)'.dependencies`. \
90+
This key is not supported for selecting dependencies \
91+
and will not work as expected. \
92+
Use the [features] section instead: \
93+
https://doc.rust-lang.org/cargo/reference/features.html"
94+
))
9795
},
9896
}
9997
}

‎src/bin/cargo/cli.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ fn expand_aliases(
151151
// capture those global options now.
152152
// Note that an alias to an external command will not receive
153153
// these arguments. That may be confusing, but such is life.
154-
let global_args = GlobalArgs::new(&args);
154+
let global_args = GlobalArgs::new(args);
155155
let new_args = cli()
156156
.setting(AppSettings::NoBinaryName)
157157
.get_matches_from_safe(alias)?;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,7 @@ impl<'a, 'cfg: 'a> CompilationFiles<'a, 'cfg> {
271271

272272
let file_type = file_types
273273
.iter()
274-
.filter(|file_type| file_type.flavor == FileFlavor::Normal)
275-
.next()
274+
.find(|file_type| file_type.flavor == FileFlavor::Normal)
276275
.expect("target must support `bin`");
277276

278277
Ok(dest.join(file_type.filename(target.name())))

‎src/cargo/core/compiler/unit_dependencies.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,7 @@ fn compute_deps<'a, 'cfg>(
267267
// If this is an optional dependency, and the new feature resolver
268268
// did not enable it, don't include it.
269269
if dep.is_optional() {
270-
let features_for = match unit_for.is_for_build_dep() {
271-
true => FeaturesFor::BuildDep,
272-
false => FeaturesFor::NormalOrDev,
273-
};
270+
let features_for = unit_for.map_to_features_for();
274271

275272
let feats = state.activated_features(id, features_for);
276273
if !feats.contains(&dep.name_in_toml()) {
@@ -627,10 +624,7 @@ fn new_unit_dep_with_profile<'a>(
627624
let public = state
628625
.resolve()
629626
.is_public_dep(parent.pkg.package_id(), pkg.package_id());
630-
let features_for = match unit_for.is_for_build_dep() {
631-
true => FeaturesFor::BuildDep,
632-
false => FeaturesFor::NormalOrDev,
633-
};
627+
let features_for = unit_for.map_to_features_for();
634628
let features = state.activated_features(pkg.package_id(), features_for);
635629
let unit = state
636630
.bcx

‎src/cargo/core/profiles.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use crate::core::compiler::CompileMode;
22
use crate::core::interning::InternedString;
3+
use crate::core::resolver::features::FeaturesFor;
34
use crate::core::{Feature, Features, PackageId, PackageIdSpec, Resolve, Shell};
45
use crate::util::errors::CargoResultExt;
56
use crate::util::toml::{ProfilePackageSpec, StringOrBool, TomlProfile, TomlProfiles, U32OrBool};
@@ -975,6 +976,14 @@ impl UnitFor {
975976
];
976977
ALL
977978
}
979+
980+
pub(crate) fn map_to_features_for(&self) -> FeaturesFor {
981+
if self.is_for_build_dep() {
982+
FeaturesFor::BuildDep
983+
} else {
984+
FeaturesFor::NormalOrDev
985+
}
986+
}
978987
}
979988

980989
/// Takes the manifest profiles, and overlays the config profiles on-top.

‎src/cargo/core/resolver/resolve.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,7 @@ impl PartialEq for Resolve {
385385
fn eq(&self, other: &Resolve) -> bool {
386386
macro_rules! compare {
387387
($($fields:ident)* | $($ignored:ident)*) => {
388-
let Resolve { $($fields,)* $($ignored,)* } = self;
389-
$(drop($ignored);)*
388+
let Resolve { $($fields,)* $($ignored: _,)* } = self;
390389
$($fields == &other.$fields)&&*
391390
}
392391
}

‎src/cargo/core/workspace.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ impl<'cfg> Workspace<'cfg> {
884884
.map(|m| (m, RequestedFeatures::new_all(false)))
885885
.collect());
886886
}
887-
return Ok(members);
887+
Ok(members)
888888
} else {
889889
let ms = self.members().filter_map(|member| {
890890
let member_id = member.package_id();
@@ -911,7 +911,7 @@ impl<'cfg> Workspace<'cfg> {
911911
}
912912
}
913913
});
914-
return Ok(ms.collect());
914+
Ok(ms.collect())
915915
}
916916
}
917917
}

‎src/cargo/ops/cargo_clean.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ use crate::core::compiler::unit_dependencies;
77
use crate::core::compiler::{BuildConfig, BuildContext, CompileKind, CompileMode, Context};
88
use crate::core::compiler::{RustcTargetData, UnitInterner};
99
use crate::core::profiles::{Profiles, UnitFor};
10-
use crate::core::resolver::features::{
11-
FeatureResolver, FeaturesFor, HasDevUnits, RequestedFeatures,
12-
};
10+
use crate::core::resolver::features::{FeatureResolver, HasDevUnits, RequestedFeatures};
1311
use crate::core::{PackageIdSpec, Workspace};
1412
use crate::ops;
1513
use crate::util::errors::{CargoResult, CargoResultExt};
@@ -120,10 +118,7 @@ pub fn clean(ws: &Workspace<'_>, opts: &CleanOptions<'_>) -> CargoResult<()> {
120118
};
121119
// Use unverified here since this is being more
122120
// exhaustive than what is actually needed.
123-
let features_for = match unit_for.is_for_build_dep() {
124-
true => FeaturesFor::BuildDep,
125-
false => FeaturesFor::NormalOrDev,
126-
};
121+
let features_for = unit_for.map_to_features_for();
127122
let features =
128123
features.activated_features_unverified(pkg.package_id(), features_for);
129124
units.push(bcx.units.intern(

‎src/cargo/ops/cargo_compile.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -312,9 +312,10 @@ pub fn compile_ws<'a>(
312312
let specs = spec.to_package_id_specs(ws)?;
313313
let dev_deps = ws.require_optional_deps() || filter.need_dev_deps(build_config.mode);
314314
let opts = ResolveOpts::new(dev_deps, features, all_features, !no_default_features);
315-
let has_dev_units = match filter.need_dev_deps(build_config.mode) {
316-
true => HasDevUnits::Yes,
317-
false => HasDevUnits::No,
315+
let has_dev_units = if filter.need_dev_deps(build_config.mode) {
316+
HasDevUnits::Yes
317+
} else {
318+
HasDevUnits::No
318319
};
319320
let resolve = ops::resolve_ws_with_opts(
320321
ws,
@@ -950,9 +951,10 @@ fn resolve_all_features(
950951
// required-features field when deciding whether to be built or skipped.
951952
for (dep_id, deps) in resolve_with_overrides.deps(package_id) {
952953
for dep in deps {
953-
let features_for = match dep.is_build() {
954-
true => FeaturesFor::BuildDep,
955-
false => FeaturesFor::NormalOrDev,
954+
let features_for = if dep.is_build() {
955+
FeaturesFor::BuildDep
956+
} else {
957+
FeaturesFor::NormalOrDev
956958
};
957959
for feature in resolved_features.activated_features(dep_id, features_for) {
958960
features.insert(dep.name_in_toml().to_string() + "/" + &feature);

‎src/cargo/ops/cargo_output_metadata.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ fn build_resolve_graph_r(
172172
if node_map.contains_key(&pkg_id) {
173173
return;
174174
}
175-
let features = resolve.features(pkg_id).iter().cloned().collect();
175+
let features = resolve.features(pkg_id).to_vec();
176176

177177
let deps: Vec<Dep> = resolve
178178
.deps(pkg_id)

0 commit comments

Comments
 (0)