about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2019-02-06 00:28:52 +0900
committerGitHub <noreply@github.com>2019-02-06 00:28:52 +0900
commit06c9fe9641b5dfc2db85c9ab10a6a8f9df7f5172 (patch)
tree80cff48e86a886ab110be412f73c051141aa50ff
parente1f4833f1a4e529ecff11efe5715ce8e4e1b566b (diff)
parent39394c8126dcea8570dc2108f0918478bfb6962e (diff)
Rollup merge of #58106 - Centril:libfmt_macros-2018, r=oli-obk
libfmt_macros => 2018

Transitions `libfmt_macros` to Rust 2018; cc https://github.com/rust-lang/rust/issues/58099

r? @oli-obk
-rw-r--r--src/libfmt_macros/Cargo.toml1
-rw-r--r--src/libfmt_macros/lib.rs13
2 files changed, 8 insertions, 6 deletions
diff --git a/src/libfmt_macros/Cargo.toml b/src/libfmt_macros/Cargo.toml
index b3f4d2deae2..50779a2d9ad 100644
--- a/src/libfmt_macros/Cargo.toml
+++ b/src/libfmt_macros/Cargo.toml
@@ -2,6 +2,7 @@
 authors = ["The Rust Project Developers"]
 name = "fmt_macros"
 version = "0.0.0"
+edition = "2018"
 
 [lib]
 name = "fmt_macros"
diff --git a/src/libfmt_macros/lib.rs b/src/libfmt_macros/lib.rs
index 4f516f18bbf..7bfe2377cea 100644
--- a/src/libfmt_macros/lib.rs
+++ b/src/libfmt_macros/lib.rs
@@ -10,14 +10,15 @@
        html_playground_url = "https://play.rust-lang.org/",
        test(attr(deny(warnings))))]
 
-#![feature(nll)]
+#![deny(rust_2018_idioms)]
+
 #![feature(rustc_private)]
 
-pub use self::Piece::*;
-pub use self::Position::*;
-pub use self::Alignment::*;
-pub use self::Flag::*;
-pub use self::Count::*;
+pub use Piece::*;
+pub use Position::*;
+pub use Alignment::*;
+pub use Flag::*;
+pub use Count::*;
 
 use std::str;
 use std::string;