]> git.proxmox.com Git - cargo.git/commitdiff
Accept `default_features` for `default-features`
authorAlex Crichton <alex@alexcrichton.com>
Mon, 27 Feb 2017 22:01:33 +0000 (14:01 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Mon, 27 Feb 2017 22:02:02 +0000 (14:02 -0800)
This was accepted by this historical TOML parser, so we'll need to preserve this
ability.

Closes #3768

src/cargo/util/toml.rs

index d44dafe56be472dca1d52c34c3aaeb9a27e3d0fc..6c143b96440c49532fe985abb36aa9e93119150c 100644 (file)
@@ -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 {