diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-04-08 14:31:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-08 14:31:10 +0200 |
| commit | 4daaf19138695b7b75a46f1a07e014fcedd357e9 (patch) | |
| tree | 9c92e0a4aacbdec90efc0bde057daa4fe5643e53 | |
| parent | 71e02a01a14b00c8bbc4a679d258c07270bfe226 (diff) | |
| parent | ca92c0a7a472e3d641bb5b38e69851317dc0986a (diff) | |
| download | rust-4daaf19138695b7b75a46f1a07e014fcedd357e9.tar.gz rust-4daaf19138695b7b75a46f1a07e014fcedd357e9.zip | |
Rollup merge of #122807 - danielhuang:fix-1, r=davidtwco
Add consistency with phrases "meantime" and "mean time" "mean time" is used in a few places while "meantime" is used everywhere else; this would make usage consistent throughout the codebase.
| -rw-r--r-- | clippy_lints/src/misc.rs | 2 | ||||
| -rw-r--r-- | tests/ui-internal/custom_ice_message.stderr | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/clippy_lints/src/misc.rs b/clippy_lints/src/misc.rs index f5ce8dd29b1..3cf054e7207 100644 --- a/clippy_lints/src/misc.rs +++ b/clippy_lints/src/misc.rs @@ -66,7 +66,7 @@ declare_clippy_lint! { /// /// ### Known problems /// The lint does not work properly with desugaring and - /// macro, it has been allowed in the mean time. + /// macro, it has been allowed in the meantime. /// /// ### Example /// ```no_run diff --git a/tests/ui-internal/custom_ice_message.stderr b/tests/ui-internal/custom_ice_message.stderr index b84f4e87e07..763ce59ba1d 100644 --- a/tests/ui-internal/custom_ice_message.stderr +++ b/tests/ui-internal/custom_ice_message.stderr @@ -4,7 +4,7 @@ note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace error: the compiler unexpectedly panicked. this is a bug. -note: it seems that this compiler <version> is outdated, a newer nightly should have been released in the mean time +note: it seems that this compiler <version> is outdated, a newer nightly should have been released in the meantime | = note: please consider running `rustup update nightly` to update the nightly channel and check if this problem still persists = note: if the problem still persists, we would appreciate a bug report: https://github.com/rust-lang/rust-clippy/issues/new?template=ice.yml |