diff options
| author | bors <bors@rust-lang.org> | 2024-08-21 17:18:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-08-21 17:18:07 +0000 |
| commit | 6b678c57b63b3062fb97130b3617b82657f59c80 (patch) | |
| tree | cdb3668b09860967f31162df4cb1c915fc62ccb8 /compiler/rustc_passes/src | |
| parent | 982c6f8721416431ec62bb0b9105c0578a9fc603 (diff) | |
| parent | 9fd2832a7ee414c8baf8ab1d3963443cd9b9fff3 (diff) | |
| download | rust-6b678c57b63b3062fb97130b3617b82657f59c80.tar.gz rust-6b678c57b63b3062fb97130b3617b82657f59c80.zip | |
Auto merge of #129359 - matthiaskrgr:rollup-nyre44t, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #128627 (Special case DUMMY_SP to emit line 0/column 0 locations on DWARF platforms.) - #128843 (Minor Refactor: Remove a Redundant Conditional Check) - #129179 (CFI: Erase regions when projecting ADT to its transparent non-1zst field) - #129281 (Tweak unreachable lint wording) - #129312 (Fix stability attribute of `impl !Error for &str`) - #129332 (Avoid extra `cast()`s after `CStr::as_ptr()`) - #129339 (Make `ArgAbi::make_indirect_force` more specific) - #129344 (Use `bool` in favor of `Option<()>` for diagnostics) - #129345 (Use shorthand field initialization syntax more aggressively in the compiler) - #129355 (fix comment on PlaceMention semantics) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_passes/src')
| -rw-r--r-- | compiler/rustc_passes/src/check_attr.rs | 3 | ||||
| -rw-r--r-- | compiler/rustc_passes/src/diagnostic_items.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_passes/src/errors.rs | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/compiler/rustc_passes/src/check_attr.rs b/compiler/rustc_passes/src/check_attr.rs index e3c2999142f..c93fb5c23b1 100644 --- a/compiler/rustc_passes/src/check_attr.rs +++ b/compiler/rustc_passes/src/check_attr.rs @@ -2619,8 +2619,7 @@ fn check_duplicates( warning: matches!( duplicates, FutureWarnFollowing | FutureWarnPreceding - ) - .then_some(()), + ), }, ); } diff --git a/compiler/rustc_passes/src/diagnostic_items.rs b/compiler/rustc_passes/src/diagnostic_items.rs index 659281c5e71..624ebb2f9f2 100644 --- a/compiler/rustc_passes/src/diagnostic_items.rs +++ b/compiler/rustc_passes/src/diagnostic_items.rs @@ -49,7 +49,7 @@ fn report_duplicate_item( orig_span, crate_name: tcx.crate_name(item_def_id.krate), orig_crate_name: tcx.crate_name(original_def_id.krate), - different_crates: (item_def_id.krate != original_def_id.krate).then_some(()), + different_crates: (item_def_id.krate != original_def_id.krate), name, }); } diff --git a/compiler/rustc_passes/src/errors.rs b/compiler/rustc_passes/src/errors.rs index ee7d097e5d3..1190e60f41f 100644 --- a/compiler/rustc_passes/src/errors.rs +++ b/compiler/rustc_passes/src/errors.rs @@ -752,7 +752,7 @@ pub struct UnusedDuplicate { #[note] pub other: Span, #[warning] - pub warning: Option<()>, + pub warning: bool, } #[derive(Diagnostic)] @@ -911,7 +911,7 @@ pub struct DuplicateDiagnosticItemInCrate { #[note(passes_diagnostic_item_first_defined)] pub orig_span: Option<Span>, #[note] - pub different_crates: Option<()>, + pub different_crates: bool, pub crate_name: Symbol, pub orig_crate_name: Symbol, pub name: Symbol, |