From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Wed, 4 Oct 2017 18:26:30 +0000 (+0200)
Subject: Use specific methods to add requirements
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~5^2~16^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=abf4122f0f3bc33f3f0c9295ec994c459aa74dae;p=cargo.git

Use specific methods to add requirements
---

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, .. } => {}