diff options
| author | kennytm <kennytm@gmail.com> | 2019-02-06 00:28:58 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-06 00:28:58 +0900 |
| commit | b9def8ee642972199d5c97e96157de8284eaab20 (patch) | |
| tree | 25c369e0c1ff4929b67f2430fb3462fc75932a96 | |
| parent | c4af395cb14844d3f8a45f78dd4ac53706d50d1b (diff) | |
| parent | 47a587fb2b8f654aa165e2f87e533bc99b1546fd (diff) | |
| download | rust-b9def8ee642972199d5c97e96157de8284eaab20.tar.gz rust-b9def8ee642972199d5c97e96157de8284eaab20.zip | |
Rollup merge of #58113 - h-michael:build-manifest-2018, r=alexcrichton
Transition build-manifest to 2018 edition #58099
| -rw-r--r-- | src/tools/build-manifest/Cargo.toml | 3 | ||||
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/tools/build-manifest/Cargo.toml b/src/tools/build-manifest/Cargo.toml index 844b7aad72f..93d0f61e1d9 100644 --- a/src/tools/build-manifest/Cargo.toml +++ b/src/tools/build-manifest/Cargo.toml @@ -2,8 +2,9 @@ name = "build-manifest" version = "0.1.0" authors = ["Alex Crichton <alex@alexcrichton.com>"] +edition = "2018" [dependencies] toml = "0.4" -serde = "1.0" +serde = { version = "1.0", features = ["derive"] } serde_derive = "1.0" diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 91cfa0981ac..eaba473f9c3 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -1,6 +1,7 @@ -extern crate toml; -#[macro_use] -extern crate serde_derive; +#![deny(rust_2018_idioms)] + +use toml; +use serde::Serialize; use std::collections::BTreeMap; use std::env; @@ -469,7 +470,7 @@ impl Builder { } manifest.pkg.insert("rust".to_string(), pkg); - return manifest; + manifest } fn profile(&mut self, |