Skip to content

Commit

Permalink
Rollup merge of #122807 - danielhuang:fix-1, r=davidtwco
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
matthiaskrgr authored Apr 8, 2024
2 parents 71e02a0 + ca92c0a commit 4daaf19
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion clippy_lints/src/misc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/ui-internal/custom_ice_message.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4daaf19

Please sign in to comment.