Rollup merge of rust-lang#58113 - h-michael:build-manifest-2018, r=al…

…excrichton Transition build-manifest to 2018 edition rust-lang#58099
kennytm · Feb 5, 2019 · b9def8e · b9def8e
2 parents c4af395 + 47a587f
commit b9def8e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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 <[email protected]>"]
+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
@@ -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,