bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #122807 - danielhuang:fix-1, r=davidtwco

Browse source 
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.
This commit is contained in:
Matthias Krüger 2024-04-08 14:31:10 +02:00 • committed by GitHub
commit 98fbf86af9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_driver_impl/messages.ftl
View file

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

2
compiler/rustc_lint/src/opaque_hidden_inferred_bound.rs
View file

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

2
compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp
View file

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

2
src/tools/clippy/clippy_lints/src/misc.rs
View file

@ -66,7 +66,7 @@ declare_clippy_lint! {
/// ///
/// ### Known problems /// ### Known problems
/// The lint does not work properly with desugaring and /// 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 /// ### Example
/// ```no_run /// ```no_run

2
src/tools/clippy/tests/ui-internal/custom_ice_message.stderr
View file

@ -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. 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: 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 = note: if the problem still persists, we would appreciate a bug report: https://github.com/rust-lang/rust-clippy/issues/new?template=ice.yml