Use specific methods to add requirements

diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs
index 28740cb22f4770971ecfcd0e40c13ee95f33d626..63f20a6cfba3ea054c17caa7e230628bb2f75bf8 100644 (file)
--- 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, .. } => {}