From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 27 Feb 2017 22:01:33 +0000 (-0800)
Subject: Accept `default_features` for `default-features`
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~9^2~126^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fd25593b22fe244a166f83849756743d4c49e6cc;p=cargo.git

Accept `default_features` for `default-features`

This was accepted by this historical TOML parser, so we'll need to preserve this
ability.

Closes #3768
---

diff --git a/src/cargo/util/toml.rs b/src/cargo/util/toml.rs
index d44dafe56..6c143b964 100644
--- a/src/cargo/util/toml.rs
+++ b/src/cargo/util/toml.rs
@@ -211,6 +211,8 @@ pub struct DetailedTomlDependency {
     optional: Option<bool>,
     #[serde(rename = "default-features")]
     default_features: Option<bool>,
+    #[serde(rename = "default_features")]
+    default_features2: Option<bool>,
 }
 
 #[derive(Deserialize)]
@@ -947,7 +949,9 @@ impl TomlDependency {
             None => DependencyInner::parse(name, version, &new_source_id, None)?,
         };
         dep = dep.set_features(details.features.unwrap_or(Vec::new()))
-                 .set_default_features(details.default_features.unwrap_or(true))
+                 .set_default_features(details.default_features
+                                              .or(details.default_features2)
+                                              .unwrap_or(true))
                  .set_optional(details.optional.unwrap_or(false))
                  .set_platform(cx.platform.clone());
         if let Some(kind) = kind {