diff options
| author | bors <bors@rust-lang.org> | 2024-03-10 22:16:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-10 22:16:22 +0000 |
| commit | 76ee6fc926032c16a5706086922fc1125c061b70 (patch) | |
| tree | 6081c0ea7a3e3979b1193e4bdbe612aaeb4d7194 /compiler/rustc_passes/src/entry.rs | |
| parent | 3b1717c052de4a2dbdd3badb0e7a885f40a8ad9e (diff) | |
| parent | 16ffeb208d67b2717bc6826d5310d326096bc27c (diff) | |
| download | rust-76ee6fc926032c16a5706086922fc1125c061b70.tar.gz rust-76ee6fc926032c16a5706086922fc1125c061b70.zip | |
Auto merge of #122312 - matthiaskrgr:rollup-0p8y7gg, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #122275 (disable OOM test in Miri) - #122276 (io::Read trait: make it more clear when we are adressing implementations vs callers) - #122277 (BorrowedCursor docs clarification) - #122286 (use Instance::expect_resolve() instead of unwraping Instance::resolve()) - #122290 (MIR printing: print the path of uneval'd const) - #122293 (diagnostics: Do not suggest using `#[unix_sigpipe]` without a value) - #122297 (bootstrap: document what the triples in 'Build' mean) - #122302 (docs: Correct ptr/ref verbiage in SliceIndex docs.) - #122304 (fix metadata for dyn-star in new solver) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_passes/src/entry.rs')
| -rw-r--r-- | compiler/rustc_passes/src/entry.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_passes/src/entry.rs b/compiler/rustc_passes/src/entry.rs index 5246389248e..0bab13037e4 100644 --- a/compiler/rustc_passes/src/entry.rs +++ b/compiler/rustc_passes/src/entry.rs @@ -156,13 +156,13 @@ fn sigpipe(tcx: TyCtxt<'_>, def_id: DefId) -> u8 { (Some(sym::inherit), None) => sigpipe::INHERIT, (Some(sym::sig_ign), None) => sigpipe::SIG_IGN, (Some(sym::sig_dfl), None) => sigpipe::SIG_DFL, - (_, Some(_)) => { - // Keep going so that `fn emit_malformed_attribute()` can print - // an excellent error message + (Some(_), None) => { + tcx.dcx().emit_err(UnixSigpipeValues { span: attr.span }); sigpipe::DEFAULT } _ => { - tcx.dcx().emit_err(UnixSigpipeValues { span: attr.span }); + // Keep going so that `fn emit_malformed_attribute()` can print + // an excellent error message sigpipe::DEFAULT } } |
