From abf4122f0f3bc33f3f0c9295ec994c459aa74dae Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Wed, 4 Oct 2017 20:26:30 +0200 Subject: [PATCH] Use specific methods to add requirements --- src/cargo/core/resolver/mod.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs index 28740cb22..63f20a6cf 100644 --- a/src/cargo/core/resolver/mod.rs +++ b/src/cargo/core/resolver/mod.rs @@ -955,10 +955,10 @@ fn build_requirements<'a, 'b: 'a>(s: &'a Summary, method: &'b Method) match *method { Method::Everything => { for key in s.features().keys() { - reqs.add_feature(key)?; + reqs.require_feature(key)?; } for dep in s.dependencies().iter().filter(|d| d.is_optional()) { - reqs.add_feature(dep.name())?; + reqs.require_dependency(dep.name()); } } Method::Required { features: requested_features, .. } => { @@ -971,7 +971,7 @@ fn build_requirements<'a, 'b: 'a>(s: &'a Summary, method: &'b Method) Method::Everything | Method::Required { uses_default_features: true, .. } => { if s.features().get("default").is_some() { - reqs.add_feature("default")?; + reqs.require_feature("default")?; } } Method::Required { uses_default_features: false, .. } => {} -- 2.30.2