Skip to content

Commit 4daaf19

Browse files
authored
Rollup merge of rust-lang#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.
2 parents 71e02a0 + ca92c0a commit 4daaf19

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Diff for: clippy_lints/src/misc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ declare_clippy_lint! {
6666
///
6767
/// ### Known problems
6868
/// The lint does not work properly with desugaring and
69-
/// macro, it has been allowed in the mean time.
69+
/// macro, it has been allowed in the meantime.
7070
///
7171
/// ### Example
7272
/// ```no_run

Diff for: tests/ui-internal/custom_ice_message.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
44

55
error: the compiler unexpectedly panicked. this is a bug.
66

7-
note: it seems that this compiler <version> is outdated, a newer nightly should have been released in the mean time
7+
note: it seems that this compiler <version> is outdated, a newer nightly should have been released in the meantime
88
|
99
= note: please consider running `rustup update nightly` to update the nightly channel and check if this problem still persists
1010
= note: if the problem still persists, we would appreciate a bug report: https://github.com/rust-lang/rust-clippy/issues/new?template=ice.yml

0 commit comments

Comments
 (0)