Skip to content

Commit 6b678c5

Browse files
borsbors
committed
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
2 parents 982c6f8 + 9fd2832 commit 6b678c5

File tree

126 files changed

+985
-861
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+985
-861
lines changed

‎compiler/rustc_ast_lowering/src/asm.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
8686
// Multiple different abi names may actually be the same ABI
8787
// If the specified ABIs are not the same name, alert the user that they resolve to the same ABI
8888
let source_map = self.tcx.sess.source_map();
89-
let equivalent = (source_map.span_to_snippet(*prev_sp)
90-
!= source_map.span_to_snippet(*abi_span))
91-
.then_some(());
89+
let equivalent = source_map.span_to_snippet(*prev_sp)
90+
!= source_map.span_to_snippet(*abi_span);
9291

9392
self.dcx().emit_err(AbiSpecifiedMultipleTimes {
9493
abi_span: *abi_span,

‎compiler/rustc_ast_lowering/src/errors.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ pub struct AbiSpecifiedMultipleTimes {
184184
#[label]
185185
pub prev_span: Span,
186186
#[note]
187-
pub equivalent: Option<()>,
187+
pub equivalent: bool,
188188
}
189189

190190
#[derive(Diagnostic)]

‎compiler/rustc_ast_lowering/src/item.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
14211421
};
14221422
hir::FnHeader {
14231423
safety: self.lower_safety(h.safety, default_safety),
1424-
asyncness: asyncness,
1424+
asyncness,
14251425
constness: self.lower_constness(h.constness),
14261426
abi: self.lower_extern(h.ext),
14271427
}

‎compiler/rustc_ast_passes/src/ast_validation.rs

+10-13
Original file line numberDiff line numberDiff line change
@@ -562,10 +562,8 @@ impl<'a> AstValidator<'a> {
562562
FnHeader { safety: _, coroutine_kind, constness, ext }: FnHeader,
563563
) {
564564
let report_err = |span| {
565-
self.dcx().emit_err(errors::FnQualifierInExtern {
566-
span: span,
567-
block: self.current_extern_span(),
568-
});
565+
self.dcx()
566+
.emit_err(errors::FnQualifierInExtern { span, block: self.current_extern_span() });
569567
};
570568
match coroutine_kind {
571569
Some(knd) => report_err(knd.span()),
@@ -963,14 +961,13 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
963961
self_ty,
964962
items,
965963
}) => {
966-
let error =
967-
|annotation_span, annotation, only_trait: bool| errors::InherentImplCannot {
968-
span: self_ty.span,
969-
annotation_span,
970-
annotation,
971-
self_ty: self_ty.span,
972-
only_trait: only_trait.then_some(()),
973-
};
964+
let error = |annotation_span, annotation, only_trait| errors::InherentImplCannot {
965+
span: self_ty.span,
966+
annotation_span,
967+
annotation,
968+
self_ty: self_ty.span,
969+
only_trait,
970+
};
974971

975972
self.with_in_trait_impl(None, |this| {
976973
this.visibility_not_permitted(
@@ -1195,7 +1192,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
11951192
} else if where_clauses.after.has_where_token {
11961193
self.dcx().emit_err(errors::WhereClauseAfterTypeAlias {
11971194
span: where_clauses.after.span,
1198-
help: self.session.is_nightly_build().then_some(()),
1195+
help: self.session.is_nightly_build(),
11991196
});
12001197
}
12011198
}

‎compiler/rustc_ast_passes/src/errors.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ pub struct InherentImplCannot<'a> {
484484
#[label(ast_passes_type)]
485485
pub self_ty: Span,
486486
#[note(ast_passes_only_trait)]
487-
pub only_trait: Option<()>,
487+
pub only_trait: bool,
488488
}
489489

490490
#[derive(Diagnostic)]
@@ -528,7 +528,7 @@ pub struct WhereClauseAfterTypeAlias {
528528
#[primary_span]
529529
pub span: Span,
530530
#[help]
531-
pub help: Option<()>,
531+
pub help: bool,
532532
}
533533

534534
#[derive(Diagnostic)]

‎compiler/rustc_attr/src/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ pub fn find_deprecation(
846846
sess.dcx().emit_err(
847847
session_diagnostics::DeprecatedItemSuggestion {
848848
span: mi.span,
849-
is_nightly: sess.is_nightly_build().then_some(()),
849+
is_nightly: sess.is_nightly_build(),
850850
details: (),
851851
},
852852
);

‎compiler/rustc_attr/src/session_diagnostics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ pub(crate) struct DeprecatedItemSuggestion {
342342
pub span: Span,
343343

344344
#[help]
345-
pub is_nightly: Option<()>,
345+
pub is_nightly: bool,
346346

347347
#[note]
348348
pub details: (),

‎compiler/rustc_codegen_llvm/src/allocator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ fn create_wrapper_function(
149149
}
150150
llvm::LLVMRustSetVisibility(callee, llvm::Visibility::Hidden);
151151

152-
let llbb = llvm::LLVMAppendBasicBlockInContext(llcx, llfn, c"entry".as_ptr().cast());
152+
let llbb = llvm::LLVMAppendBasicBlockInContext(llcx, llfn, c"entry".as_ptr());
153153

154154
let llbuilder = llvm::LLVMCreateBuilderInContext(llcx);
155155
llvm::LLVMPositionBuilderAtEnd(llbuilder, llbb);

‎compiler/rustc_codegen_llvm/src/back/lto.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ pub(crate) fn run_pass_manager(
616616
llvm::LLVMRustAddModuleFlagU32(
617617
module.module_llvm.llmod(),
618618
llvm::LLVMModFlagBehavior::Error,
619-
c"LTOPostLink".as_ptr().cast(),
619+
c"LTOPostLink".as_ptr(),
620620
1,
621621
);
622622
}

‎compiler/rustc_codegen_llvm/src/back/write.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1031,7 +1031,7 @@ unsafe fn embed_bitcode(
10311031
let llglobal = llvm::LLVMAddGlobal(
10321032
llmod,
10331033
common::val_ty(llconst),
1034-
c"rustc.embedded.module".as_ptr().cast(),
1034+
c"rustc.embedded.module".as_ptr(),
10351035
);
10361036
llvm::LLVMSetInitializer(llglobal, llconst);
10371037

@@ -1044,7 +1044,7 @@ unsafe fn embed_bitcode(
10441044
let llglobal = llvm::LLVMAddGlobal(
10451045
llmod,
10461046
common::val_ty(llconst),
1047-
c"rustc.embedded.cmdline".as_ptr().cast(),
1047+
c"rustc.embedded.cmdline".as_ptr(),
10481048
);
10491049
llvm::LLVMSetInitializer(llglobal, llconst);
10501050
let section = if is_apple {
@@ -1054,7 +1054,7 @@ unsafe fn embed_bitcode(
10541054
} else {
10551055
c".llvmcmd"
10561056
};
1057-
llvm::LLVMSetSection(llglobal, section.as_ptr().cast());
1057+
llvm::LLVMSetSection(llglobal, section.as_ptr());
10581058
llvm::LLVMRustSetLinkage(llglobal, llvm::Linkage::PrivateLinkage);
10591059
} else {
10601060
// We need custom section flags, so emit module-level inline assembly.
@@ -1107,7 +1107,7 @@ fn create_msvc_imps(
11071107
.collect::<Vec<_>>();
11081108

11091109
for (imp_name, val) in globals {
1110-
let imp = llvm::LLVMAddGlobal(llmod, ptr_ty, imp_name.as_ptr().cast());
1110+
let imp = llvm::LLVMAddGlobal(llmod, ptr_ty, imp_name.as_ptr());
11111111
llvm::LLVMSetInitializer(imp, val);
11121112
llvm::LLVMRustSetLinkage(imp, llvm::Linkage::ExternalLinkage);
11131113
}

‎compiler/rustc_codegen_llvm/src/consts.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ impl<'ll> CodegenCx<'ll, '_> {
525525
let val = llvm::LLVMMetadataAsValue(self.llcx, meta);
526526
llvm::LLVMAddNamedMetadataOperand(
527527
self.llmod,
528-
c"wasm.custom_sections".as_ptr().cast(),
528+
c"wasm.custom_sections".as_ptr(),
529529
val,
530530
);
531531
}

‎compiler/rustc_codegen_llvm/src/context.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -207,15 +207,15 @@ pub unsafe fn create_module<'ll>(
207207
// If skipping the PLT is enabled, we need to add some module metadata
208208
// to ensure intrinsic calls don't use it.
209209
if !sess.needs_plt() {
210-
let avoid_plt = c"RtLibUseGOT".as_ptr().cast();
210+
let avoid_plt = c"RtLibUseGOT".as_ptr();
211211
unsafe {
212212
llvm::LLVMRustAddModuleFlagU32(llmod, llvm::LLVMModFlagBehavior::Warning, avoid_plt, 1);
213213
}
214214
}
215215

216216
// Enable canonical jump tables if CFI is enabled. (See https://reviews.llvm.org/D65629.)
217217
if sess.is_sanitizer_cfi_canonical_jump_tables_enabled() && sess.is_sanitizer_cfi_enabled() {
218-
let canonical_jump_tables = c"CFI Canonical Jump Tables".as_ptr().cast();
218+
let canonical_jump_tables = c"CFI Canonical Jump Tables".as_ptr();
219219
unsafe {
220220
llvm::LLVMRustAddModuleFlagU32(
221221
llmod,
@@ -228,7 +228,7 @@ pub unsafe fn create_module<'ll>(
228228

229229
// Enable LTO unit splitting if specified or if CFI is enabled. (See https://reviews.llvm.org/D53891.)
230230
if sess.is_split_lto_unit_enabled() || sess.is_sanitizer_cfi_enabled() {
231-
let enable_split_lto_unit = c"EnableSplitLTOUnit".as_ptr().cast();
231+
let enable_split_lto_unit = c"EnableSplitLTOUnit".as_ptr();
232232
unsafe {
233233
llvm::LLVMRustAddModuleFlagU32(
234234
llmod,
@@ -241,7 +241,7 @@ pub unsafe fn create_module<'ll>(
241241

242242
// Add "kcfi" module flag if KCFI is enabled. (See https://reviews.llvm.org/D119296.)
243243
if sess.is_sanitizer_kcfi_enabled() {
244-
let kcfi = c"kcfi".as_ptr().cast();
244+
let kcfi = c"kcfi".as_ptr();
245245
unsafe {
246246
llvm::LLVMRustAddModuleFlagU32(llmod, llvm::LLVMModFlagBehavior::Override, kcfi, 1);
247247
}
@@ -280,26 +280,26 @@ pub unsafe fn create_module<'ll>(
280280
llvm::LLVMRustAddModuleFlagU32(
281281
llmod,
282282
llvm::LLVMModFlagBehavior::Min,
283-
c"branch-target-enforcement".as_ptr().cast(),
283+
c"branch-target-enforcement".as_ptr(),
284284
bti.into(),
285285
);
286286
llvm::LLVMRustAddModuleFlagU32(
287287
llmod,
288288
llvm::LLVMModFlagBehavior::Min,
289-
c"sign-return-address".as_ptr().cast(),
289+
c"sign-return-address".as_ptr(),
290290
pac_ret.is_some().into(),
291291
);
292292
let pac_opts = pac_ret.unwrap_or(PacRet { leaf: false, key: PAuthKey::A });
293293
llvm::LLVMRustAddModuleFlagU32(
294294
llmod,
295295
llvm::LLVMModFlagBehavior::Min,
296-
c"sign-return-address-all".as_ptr().cast(),
296+
c"sign-return-address-all".as_ptr(),
297297
pac_opts.leaf.into(),
298298
);
299299
llvm::LLVMRustAddModuleFlagU32(
300300
llmod,
301301
llvm::LLVMModFlagBehavior::Min,
302-
c"sign-return-address-with-bkey".as_ptr().cast(),
302+
c"sign-return-address-with-bkey".as_ptr(),
303303
u32::from(pac_opts.key == PAuthKey::B),
304304
);
305305
}
@@ -317,7 +317,7 @@ pub unsafe fn create_module<'ll>(
317317
llvm::LLVMRustAddModuleFlagU32(
318318
llmod,
319319
llvm::LLVMModFlagBehavior::Override,
320-
c"cf-protection-branch".as_ptr().cast(),
320+
c"cf-protection-branch".as_ptr(),
321321
1,
322322
);
323323
}
@@ -327,7 +327,7 @@ pub unsafe fn create_module<'ll>(
327327
llvm::LLVMRustAddModuleFlagU32(
328328
llmod,
329329
llvm::LLVMModFlagBehavior::Override,
330-
c"cf-protection-return".as_ptr().cast(),
330+
c"cf-protection-return".as_ptr(),
331331
1,
332332
);
333333
}
@@ -338,7 +338,7 @@ pub unsafe fn create_module<'ll>(
338338
llvm::LLVMRustAddModuleFlagU32(
339339
llmod,
340340
llvm::LLVMModFlagBehavior::Error,
341-
c"Virtual Function Elim".as_ptr().cast(),
341+
c"Virtual Function Elim".as_ptr(),
342342
1,
343343
);
344344
}

‎compiler/rustc_codegen_llvm/src/debuginfo/gdb.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ pub fn get_or_insert_gdb_debug_scripts_section_global<'ll>(cx: &CodegenCx<'ll, '
3434
let c_section_var_name = c"__rustc_debug_gdb_scripts_section__";
3535
let section_var_name = c_section_var_name.to_str().unwrap();
3636

37-
let section_var =
38-
unsafe { llvm::LLVMGetNamedGlobal(cx.llmod, c_section_var_name.as_ptr().cast()) };
37+
let section_var = unsafe { llvm::LLVMGetNamedGlobal(cx.llmod, c_section_var_name.as_ptr()) };
3938

4039
section_var.unwrap_or_else(|| {
4140
let mut section_contents = Vec::new();
@@ -70,7 +69,7 @@ pub fn get_or_insert_gdb_debug_scripts_section_global<'ll>(cx: &CodegenCx<'ll, '
7069
let section_var = cx
7170
.define_global(section_var_name, llvm_type)
7271
.unwrap_or_else(|| bug!("symbol `{}` is already defined", section_var_name));
73-
llvm::LLVMSetSection(section_var, c".debug_gdb_scripts".as_ptr().cast());
72+
llvm::LLVMSetSection(section_var, c".debug_gdb_scripts".as_ptr());
7473
llvm::LLVMSetInitializer(section_var, cx.const_bytes(section_contents));
7574
llvm::LLVMSetGlobalConstant(section_var, llvm::True);
7675
llvm::LLVMSetUnnamedAddress(section_var, llvm::UnnamedAddr::Global);

‎compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ pub fn build_compile_unit_di_node<'ll, 'tcx>(
952952
producer.as_ptr().cast(),
953953
producer.len(),
954954
tcx.sess.opts.optimize != config::OptLevel::No,
955-
c"".as_ptr().cast(),
955+
c"".as_ptr(),
956956
0,
957957
// NB: this doesn't actually have any perceptible effect, it seems. LLVM will instead
958958
// put the path supplied to `MCSplitDwarfFile` into the debug info of the final

‎compiler/rustc_codegen_llvm/src/debuginfo/mod.rs

+14-4
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,15 @@ impl<'ll, 'tcx> CodegenUnitDebugContext<'ll, 'tcx> {
109109
llvm::LLVMRustAddModuleFlagU32(
110110
self.llmod,
111111
llvm::LLVMModFlagBehavior::Warning,
112-
c"Dwarf Version".as_ptr().cast(),
112+
c"Dwarf Version".as_ptr(),
113113
dwarf_version,
114114
);
115115
} else {
116116
// Indicate that we want CodeView debug information on MSVC
117117
llvm::LLVMRustAddModuleFlagU32(
118118
self.llmod,
119119
llvm::LLVMModFlagBehavior::Warning,
120-
c"CodeView".as_ptr().cast(),
120+
c"CodeView".as_ptr(),
121121
1,
122122
)
123123
}
@@ -126,7 +126,7 @@ impl<'ll, 'tcx> CodegenUnitDebugContext<'ll, 'tcx> {
126126
llvm::LLVMRustAddModuleFlagU32(
127127
self.llmod,
128128
llvm::LLVMModFlagBehavior::Warning,
129-
c"Debug Info Version".as_ptr().cast(),
129+
c"Debug Info Version".as_ptr(),
130130
llvm::LLVMRustDebugMetadataVersion(),
131131
);
132132
}
@@ -570,7 +570,17 @@ impl<'ll, 'tcx> DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> {
570570
inlined_at: Option<&'ll DILocation>,
571571
span: Span,
572572
) -> &'ll DILocation {
573-
let DebugLoc { line, col, .. } = self.lookup_debug_loc(span.lo());
573+
// When emitting debugging information, DWARF (i.e. everything but MSVC)
574+
// treats line 0 as a magic value meaning that the code could not be
575+
// attributed to any line in the source. That's also exactly what dummy
576+
// spans are. Make that equivalence here, rather than passing dummy spans
577+
// to lookup_debug_loc, which will return line 1 for them.
578+
let (line, col) = if span.is_dummy() && !self.sess().target.is_like_msvc {
579+
(0, 0)
580+
} else {
581+
let DebugLoc { line, col, .. } = self.lookup_debug_loc(span.lo());
582+
(line, col)
583+
};
574584

575585
unsafe { llvm::LLVMRustDIBuilderCreateDebugLocation(line, col, scope, inlined_at) }
576586
}

‎compiler/rustc_codegen_ssa/src/back/linker.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1500,7 +1500,7 @@ impl<'a> Linker for L4Bender<'a> {
15001500

15011501
impl<'a> L4Bender<'a> {
15021502
pub fn new(cmd: Command, sess: &'a Session) -> L4Bender<'a> {
1503-
L4Bender { cmd, sess: sess, hinted_static: false }
1503+
L4Bender { cmd, sess, hinted_static: false }
15041504
}
15051505

15061506
fn hint_static(&mut self) {
@@ -1520,7 +1520,7 @@ pub struct AixLinker<'a> {
15201520

15211521
impl<'a> AixLinker<'a> {
15221522
pub fn new(cmd: Command, sess: &'a Session) -> AixLinker<'a> {
1523-
AixLinker { cmd, sess: sess, hinted_static: None }
1523+
AixLinker { cmd, sess, hinted_static: None }
15241524
}
15251525

15261526
fn hint_static(&mut self) {

0 commit comments

Comments
 (0)