summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThayne McCombs <astrothayne@gmail.com>2018-05-28 18:24:01 -0600
committerThayne McCombs <astrothayne@gmail.com>2018-05-28 18:24:01 -0600
commit855ec8b6d54463e8d13676d325d828d30b2737f6 (patch)
tree8b73d93c1b7c26d11e9c7380bf34b20cf08b16b7 /src
parentAuto merge of #50929 - zackmdavis:hiridification_initiative, r=michaelwoerister (diff)
downloadgrust-855ec8b6d54463e8d13676d325d828d30b2737f6.tar.gz
grust-855ec8b6d54463e8d13676d325d828d30b2737f6.tar.bz2
grust-855ec8b6d54463e8d13676d325d828d30b2737f6.tar.xz
Stabilize SystemTime::UNIX_EPOCH
Diffstat (limited to 'src')
-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 1215302757..90ab349159 100644
--- a/src/libstd/time.rs
+++ b/src/libstd/time.rs
@@ -271,7 +271,6 @@ impl SystemTime {
271 /// # Examples 271 /// # Examples
272 /// 272 ///
273 /// ```no_run 273 /// ```no_run
274 /// #![feature(assoc_unix_epoch)]
275 /// use std::time::SystemTime; 274 /// use std::time::SystemTime;
276 /// 275 ///
277 /// match SystemTime::now().duration_since(SystemTime::UNIX_EPOCH) { 276 /// match SystemTime::now().duration_since(SystemTime::UNIX_EPOCH) {
@@ -279,7 +278,7 @@ impl SystemTime {
279 /// Err(_) => panic!("SystemTime before UNIX EPOCH!"), 278 /// Err(_) => panic!("SystemTime before UNIX EPOCH!"),
280 /// } 279 /// }
281 /// ``` 280 /// ```
282 #[unstable(feature = "assoc_unix_epoch", issue = "49502")] 281 #[stable(feature = "assoc_unix_epoch", since = "1.28.0")]
283 pub const UNIX_EPOCH: SystemTime = UNIX_EPOCH; 282 pub const UNIX_EPOCH: SystemTime = UNIX_EPOCH;
284 283
285 /// Returns the system time corresponding to "now". 284 /// Returns the system time corresponding to "now".