Skip to content

Commit ffb13a5

Browse files
committed
Try to remove some rightwards drift.
1 parent b7c0e2e commit ffb13a5

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

src/cargo/core/resolver/features.rs

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -326,28 +326,30 @@ impl<'a, 'cfg> FeatureResolver<'a, 'cfg> {
326326
// Activate the optional dep.
327327
for (dep_pkg_id, deps) in self.deps(pkg_id, for_build) {
328328
for (dep, dep_for_build) in deps {
329-
if dep.name_in_toml() == *dep_name {
330-
let fvs = self.fvs_from_dependency(dep_pkg_id, dep);
331-
self.activate_pkg(dep_pkg_id, &fvs, dep_for_build)?;
329+
if dep.name_in_toml() != *dep_name {
330+
continue;
332331
}
332+
let fvs = self.fvs_from_dependency(dep_pkg_id, dep);
333+
self.activate_pkg(dep_pkg_id, &fvs, dep_for_build)?;
333334
}
334335
}
335336
}
336337
FeatureValue::CrateFeature(dep_name, dep_feature) => {
337338
// Activate a feature within a dependency.
338339
for (dep_pkg_id, deps) in self.deps(pkg_id, for_build) {
339340
for (dep, dep_for_build) in deps {
340-
if dep.name_in_toml() == *dep_name {
341-
if dep.is_optional() {
342-
// Activate the crate on self.
343-
let fv = FeatureValue::Crate(*dep_name);
344-
self.activate_fv(pkg_id, &fv, for_build)?;
345-
}
346-
// Activate the feature on the dependency.
347-
let summary = self.resolve.summary(dep_pkg_id);
348-
let fv = FeatureValue::new(*dep_feature, summary);
349-
self.activate_fv(dep_pkg_id, &fv, dep_for_build)?;
341+
if dep.name_in_toml() != *dep_name {
342+
continue;
350343
}
344+
if dep.is_optional() {
345+
// Activate the crate on self.
346+
let fv = FeatureValue::Crate(*dep_name);
347+
self.activate_fv(pkg_id, &fv, for_build)?;
348+
}
349+
// Activate the feature on the dependency.
350+
let summary = self.resolve.summary(dep_pkg_id);
351+
let fv = FeatureValue::new(*dep_feature, summary);
352+
self.activate_fv(dep_pkg_id, &fv, dep_for_build)?;
351353
}
352354
}
353355
}

0 commit comments

Comments
 (0)