diff options
| author | bors <bors@rust-lang.org> | 2025-07-19 11:10:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-07-19 11:10:04 +0000 |
| commit | 12865ffd0dfb4ea969e2f16eb0140238bb9dd382 (patch) | |
| tree | cd1b60381a5d2c032182e3fdfcfffde159f04a93 /compiler/rustc_errors | |
| parent | 83825dd277503edf5d7eda6be8b5fb9896f343f5 (diff) | |
| parent | cc699e1edf1e0f4302e9c0feff2a004afcdb2e11 (diff) | |
| download | rust-12865ffd0dfb4ea969e2f16eb0140238bb9dd382.tar.gz rust-12865ffd0dfb4ea969e2f16eb0140238bb9dd382.zip | |
Auto merge of #144166 - matthiaskrgr:rollup-wccepuo, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - rust-lang/rust#141076 (fix Zip unsoundness (again)) - rust-lang/rust#142444 (adding run-make test to autodiff) - rust-lang/rust#143704 (Be a bit more careful around exotic cycles in in the inliner) - rust-lang/rust#144073 (Don't test panic=unwind in panic_main.rs on Fuchsia) - rust-lang/rust#144083 (miri sleep tests: increase slack) - rust-lang/rust#144092 (bootstrap: Detect musl hosts) - rust-lang/rust#144098 (Do not lint private-in-public for RPITIT) - rust-lang/rust#144103 (Rename `emit_unless` to `emit_unless_delay`) - rust-lang/rust#144108 (Ignore tests/run-make/link-eh-frame-terminator/rmake.rs when cross-compiling) - rust-lang/rust#144115 (fix outdated comment) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors')
| -rw-r--r-- | compiler/rustc_errors/src/diagnostic.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_errors/src/diagnostic.rs b/compiler/rustc_errors/src/diagnostic.rs index a128f8d31a1..96c7ba6ed27 100644 --- a/compiler/rustc_errors/src/diagnostic.rs +++ b/compiler/rustc_errors/src/diagnostic.rs @@ -1421,7 +1421,7 @@ impl<'a, G: EmissionGuarantee> Diag<'a, G> { /// /// See `emit` and `delay_as_bug` for details. #[track_caller] - pub fn emit_unless(mut self, delay: bool) -> G::EmitResult { + pub fn emit_unless_delay(mut self, delay: bool) -> G::EmitResult { if delay { self.downgrade_to_delayed_bug(); } |