Skip to content

Commit b9def8e

Browse files
authoredFeb 5, 2019
Rollup merge of rust-lang#58113 - h-michael:build-manifest-2018, r=alexcrichton
Transition build-manifest to 2018 edition rust-lang#58099
2 parents c4af395 + 47a587f commit b9def8e

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed
 

‎src/tools/build-manifest/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
name = "build-manifest"
33
version = "0.1.0"
44
authors = ["Alex Crichton <alex@alexcrichton.com>"]
5+
edition = "2018"
56

67
[dependencies]
78
toml = "0.4"
8-
serde = "1.0"
9+
serde = { version = "1.0", features = ["derive"] }
910
serde_derive = "1.0"

‎src/tools/build-manifest/src/main.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
extern crate toml;
2-
#[macro_use]
3-
extern crate serde_derive;
1+
#![deny(rust_2018_idioms)]
2+
3+
use toml;
4+
use serde::Serialize;
45

56
use std::collections::BTreeMap;
67
use std::env;
@@ -469,7 +470,7 @@ impl Builder {
469470
}
470471
manifest.pkg.insert("rust".to_string(), pkg);
471472

472-
return manifest;
473+
manifest
473474
}
474475

475476
fn profile(&mut self,

0 commit comments

Comments
 (0)