Skip to content

Commit 98fbf86

matthiaskrgr matthiaskrgr

authored

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.

2 parents 337be99 + 1975871 commit 98fbf86Copy full SHA for 98fbf86

File tree

5 files changed

+5

-5

lines changed

compiler
- rustc_driver_impl
  - messages.ftl
- rustc_lint/src
  - opaque_hidden_inferred_bound.rs
- rustc_llvm/llvm-wrapper
  - ArchiveWrapper.cpp
src/tools/clippy
- clippy_lints/src
  - misc.rs
- tests/ui-internal
  - custom_ice_message.stderr

5 files changed

+5

-5

lines changed

`‎compiler/rustc_driver_impl/messages.ftl‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ driver_impl_ice = the compiler unexpectedly panicked. this is a bug.`
`2`	`2`	`driver_impl_ice_bug_report = we would appreciate a bug report: {$bug_report_url}`
`3`	`3`	`driver_impl_ice_bug_report_internal_feature = using internal features is not supported and expected to cause internal compiler errors when used incorrectly`
`4`	`4`	`driver_impl_ice_bug_report_outdated =`
`5`		- it seems that this compiler `{$version}` is outdated, a newer nightly should have been released in the mean time
	`5`	+ it seems that this compiler `{$version}` is outdated, a newer nightly should have been released in the meantime
`6`	`6`	.update = please consider running `rustup update nightly` to update the nightly channel and check if this problem still persists
`7`	`7`	`.url = if the problem still persists, we would appreciate a bug report: {$bug_report_url}`
`8`	`8`	`driver_impl_ice_exclude_cargo_defaults = some of the compiler flags provided by cargo are hidden`

`‎compiler/rustc_lint/src/opaque_hidden_inferred_bound.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ declare_lint! {`
`20`	`20`	`/// This functionality was removed in #97346, but then rolled back in #99860`
`21`	`21`	`/// because it caused regressions.`
`22`	`22`	`///`
`23`		`- /// We plan on reintroducing this as a hard error, but in the mean time,`
	`23`	`+ /// We plan on reintroducing this as a hard error, but in the meantime,`
`24`	`24`	`/// this lint serves to warn and suggest fixes for any use-cases which rely`
`25`	`25`	`/// on this behavior.`
`26`	`26`	`///`

`‎compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ LLVMRustArchiveChildName(LLVMRustArchiveChildConstRef Child, size_t *Size) {`
`147`	`147`	`Expected<StringRef> NameOrErr = Child->getName();`
`148`	`148`	`if (!NameOrErr) {`
`149`	`149`	`// rustc_codegen_llvm currently doesn't use this error string, but it might be`
`150`		`- // useful in the future, and in the mean time this tells LLVM that the`
	`150`	`+ // useful in the future, and in the meantime this tells LLVM that the`
`151`	`151`	`// error was not ignored and that it shouldn't abort the process.`
`152`	`152`	`LLVMRustSetLastError(toString(NameOrErr.takeError()).c_str());`
`153`	`153`	`return nullptr;`

`‎src/tools/clippy/clippy_lints/src/misc.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ declare_clippy_lint! {`
`66`	`66`	`///`
`67`	`67`	`/// ### Known problems`
`68`	`68`	`/// 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.`
`70`	`70`	`///`
`71`	`71`	`/// ### Example`
`72`	`72`	/// ```no_run

`‎src/tools/clippy/tests/ui-internal/custom_ice_message.stderr‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
`4`	`4`
`5`	`5`	`error: the compiler unexpectedly panicked. this is a bug.`
`6`	`6`
`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`
`8`	`8`	`\|`
`9`	`9`	= note: please consider running `rustup update nightly` to update the nightly channel and check if this problem still persists
`10`	`10`	`= 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)