diff options
| author | bors <bors@rust-lang.org> | 2022-10-20 21:08:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-20 21:08:28 +0000 |
| commit | dcb376115066d111dbf5f13d5ac2a2dbe8c12add (patch) | |
| tree | 9f47534866e40e8e35707253c4777a1ccfd64770 /library/std/src | |
| parent | 5ffa67d7309047ff47b9c624ba4061fb8c004c31 (diff) | |
| parent | f9944a9d2c3b8ec2ad2c6ebe9ca2ad34d52aa8ab (diff) | |
| download | rust-dcb376115066d111dbf5f13d5ac2a2dbe8c12add.tar.gz rust-dcb376115066d111dbf5f13d5ac2a2dbe8c12add.zip | |
Auto merge of #103322 - matthiaskrgr:rollup-m9zgpft, r=matthiaskrgr
Rollup of 9 pull requests
Successful merges:
- #103221 (Fix `SelfVisitor::is_self_ty` ICE)
- #103230 (Clarify startup)
- #103281 (Adjust `transmute{,_copy}` to be clearer about which of `T` and `U` is input vs output)
- #103288 (Fixed docs typo in `library/std/src/time.rs`)
- #103296 (+/- shortcut now only expand/collapse, not both)
- #103297 (fix typo)
- #103313 (Don't label `src/test` tests as `A-testsuite`)
- #103315 (interpret: remove an incorrect assertion)
- #103319 (Improve "`~const` is not allowed here" message)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/time.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/time.rs b/library/std/src/time.rs index 759a59e1f98..d4a1b9d9b50 100644 --- a/library/std/src/time.rs +++ b/library/std/src/time.rs @@ -356,7 +356,7 @@ impl Instant { /// /// # Panics /// - /// Previous rust versions panicked when self was earlier than the current time. Currently this + /// Previous rust versions panicked when the current time was earlier than self. Currently this /// method returns a Duration of zero in that case. Future versions may reintroduce the panic. /// See [Monotonicity]. /// |