about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-09-10 16:19:48 +0000
committerbors <bors@rust-lang.org>2019-09-10 16:19:48 +0000
commit34e82a7b793a6cdd27df762bf46bab8cdc92b14a (patch)
treefba9fd9e3b84c88b19e650ba1da44075f23b7220 /src/libstd
parent87b0c9036f0557568cfc939542508e9adf874b83 (diff)
parent8d2ef194a10fb1e1d2355170e30fef27a45b315b (diff)
downloadrust-34e82a7b793a6cdd27df762bf46bab8cdc92b14a.tar.gz
rust-34e82a7b793a6cdd27df762bf46bab8cdc92b14a.zip
Auto merge of #64354 - Centril:rollup-oaq0xoi, r=Centril
Rollup of 8 pull requests

Successful merges:

 - #63786 (Make `abs`, `wrapping_abs`, `overflowing_abs` const functions)
 - #63989 (Add Yaah to clippy toolstain notification list)
 - #64256 (test/c-variadic: Fix patterns on powerpc64)
 - #64292 (lowering: extend temporary lifetimes around await)
 - #64311 (lldb: avoid mixing "Hit breakpoint" message with other output.)
 - #64330 (Clarify E0507 to note Fn/FnMut relationship to borrowing)
 - #64331 (Changed instant is earlier to instant is later)
 - #64344 (rustc_mir: buffer -Zdump-mir output instead of pestering the kernel constantly.)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/time.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/time.rs b/src/libstd/time.rs
index d59085cd44a..dbec4da24f9 100644
--- a/src/libstd/time.rs
+++ b/src/libstd/time.rs
@@ -216,7 +216,7 @@ impl Instant {
     }
 
     /// Returns the amount of time elapsed from another instant to this one,
-    /// or None if that instant is earlier than this one.
+    /// or None if that instant is later than this one.
     ///
     /// # Examples
     ///