rollup merge of #20482: kmcallister/macro-reform

[rust.git] / src / libcore / fmt / mod.rs

diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs
index 7d92b707f98c37b7d9deefe14f9526a75e1e961e..951f5c29f00e8c923c5520e0bb9c0c341360f7b7 100644 (file)
--- a/src/libcore/fmt/mod.rs
+++ b/src/libcore/fmt/mod.rs
@@ -20,12 +20,15 @@
 use option::Option;
 use option::Option::{Some, None};
 use ops::{Deref, FnOnce};
-use result::Result::{Ok, Err};
+use result::Result::Ok;
 use result;
 use slice::SliceExt;
 use slice;
 use str::{self, StrExt, Utf8Error};
 
+// NOTE: for old macros; remove after the next snapshot
+#[cfg(stage0)] use result::Result::Err;
+
 pub use self::num::radix;
 pub use self::num::Radix;
 pub use self::num::RadixFmt;