about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-05-29 03:22:20 +0000
committerbors <bors@rust-lang.org>2018-05-29 03:22:20 +0000
commitfe5c45bb53268e9496d36a6f5956a7ec6e4854b3 (patch)
tree376fa56855f7a985e0dccb8df930fb208b14e0eb
parent5ae5361cdd7b4e518d6733fb726521563d5b4cfa (diff)
parent855ec8b6d54463e8d13676d325d828d30b2737f6 (diff)
downloadrust-fe5c45bb53268e9496d36a6f5956a7ec6e4854b3.tar.gz
rust-fe5c45bb53268e9496d36a6f5956a7ec6e4854b3.zip
Auto merge of #51144 - tmccombs:unix-epoch-stable, r=Mark-Simulacrum
Stabilize SystemTime::UNIX_EPOCH

Fixes #49502
-rw-r--r--src/libstd/time.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/time.rs b/src/libstd/time.rs
index 1215302757c..90ab3491599 100644
--- a/src/libstd/time.rs
+++ b/src/libstd/time.rs
@@ -271,7 +271,6 @@ impl SystemTime {
     /// # Examples
     ///
     /// ```no_run
-    /// #![feature(assoc_unix_epoch)]
     /// use std::time::SystemTime;
     ///
     /// match SystemTime::now().duration_since(SystemTime::UNIX_EPOCH) {
@@ -279,7 +278,7 @@ impl SystemTime {
     ///     Err(_) => panic!("SystemTime before UNIX EPOCH!"),
     /// }
     /// ```
-    #[unstable(feature = "assoc_unix_epoch", issue = "49502")]
+    #[stable(feature = "assoc_unix_epoch", since = "1.28.0")]
     pub const UNIX_EPOCH: SystemTime = UNIX_EPOCH;
 
     /// Returns the system time corresponding to "now".