auto merge of #20610 : alexcrichton/rust/rollup, r=alexcrichton

1 files changed, 4 insertions, 2 deletions

diff --git a/src/libstd/time/duration.rs b/src/libstd/time/duration.rs
index d48b0342b3b..ac1f0c5d803 100644
--- a/src/libstd/time/duration.rs
+++ b/src/libstd/time/duration.rs
@@ -17,8 +17,10 @@ use ops::{Add, Sub, Mul, Div, Neg, FnOnce};
 use option::Option;
 use option::Option::{Some, None};
 use num::Int;
-use result::Result;
-use result::Result::{Ok, Err};
+use result::Result::Ok;
+
+// NOTE: for old macros; remove after the next snapshot
+#[cfg(stage0)] use result::Result::Err;
 
 /// The number of nanoseconds in a microsecond.
 const NANOS_PER_MICRO: i32 = 1000;