Merge pull request rust-lang#403 from integer32llc/edition-feature-stable

shepmaster · web-flow · commit 8dbd4dfaa171 · 2018-09-16T08:05:13.000-04:00
The Cargo "edition" feature is now stable
diff --git a/compiler/base/modify-cargo-toml/Cargo.lock b/compiler/base/modify-cargo-toml/Cargo.lock
diff --git a/compiler/base/modify-cargo-toml/Cargo.toml b/compiler/base/modify-cargo-toml/Cargo.toml
@@ -4,6 +4,6 @@ version = "0.1.0"
 authors = ["Jake Goulding <jake.goulding@gmail.com>"]
 
 [dependencies]
-serde = "1.0.66"
+serde = "1.0.78"
 toml = "0.4.6"
-serde_derive = "1.0.66"
+serde_derive = "1.0.78"
diff --git a/compiler/base/modify-cargo-toml/src/main.rs b/compiler/base/modify-cargo-toml/src/main.rs
@@ -66,8 +66,6 @@ fn set_edition(cargo_toml: Value, edition: &str) -> Value {
     #[derive(Debug, Serialize, Deserialize)]
     #[serde(rename_all = "kebab-case")]
     struct CargoToml {
-        #[serde(default)]
-        cargo_features: Vec<String>,
         package: Package,
         #[serde(flatten)]
         other: Other,
@@ -83,7 +81,6 @@ fn set_edition(cargo_toml: Value, edition: &str) -> Value {
     }
 
     modify(cargo_toml, |mut cargo_toml: CargoToml| {
-        ensure_string_in_vec(&mut cargo_toml.cargo_features, "edition");
         cargo_toml.package.edition = edition.into();
         cargo_toml
     })
