Skip to content

Commit 20d7207

Browse files
ManishearthManishearth
authored
Rollup merge of rust-lang#103970 - oli-obk:unhide_unknown_spans, r=estebank
Unhide unknown spans r? `@estebank`
2 parents 4759140 + df2adc4 commit 20d7207

17 files changed

+121
-69
lines changed

‎compiler/rustc_error_messages/locales/en-US/passes.ftl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ passes_no_coverage_not_coverable =
4747
4848
passes_should_be_applied_to_fn =
4949
attribute should be applied to a function definition
50-
.label = not a function definition
50+
.label = {$on_crate ->
51+
[true] cannot be applied to crates
52+
*[false] not a function definition
53+
}
5154
5255
passes_naked_tracked_caller =
5356
cannot use `#[track_caller]` with `#[naked]`

‎compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ impl Emitter for AnnotateSnippetEmitterWriter {
5252
let (mut primary_span, suggestions) = self.primary_span_formatted(&diag, &fluent_args);
5353

5454
self.fix_multispans_in_extern_macros_and_render_macro_backtrace(
55-
&self.source_map,
5655
&mut primary_span,
5756
&mut children,
5857
&diag.level,

‎compiler/rustc_errors/src/emitter.rs

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ pub trait Emitter: Translate {
314314

315315
fn fix_multispans_in_extern_macros_and_render_macro_backtrace(
316316
&self,
317-
source_map: &Option<Lrc<SourceMap>>,
318317
span: &mut MultiSpan,
319318
children: &mut Vec<SubDiagnostic>,
320319
level: &Level,
@@ -340,7 +339,7 @@ pub trait Emitter: Translate {
340339
.collect();
341340

342341
if !backtrace {
343-
self.fix_multispans_in_extern_macros(source_map, span, children);
342+
self.fix_multispans_in_extern_macros(span, children);
344343
}
345344

346345
self.render_multispans_macro_backtrace(span, children, backtrace);
@@ -480,23 +479,22 @@ pub trait Emitter: Translate {
480479
// this will change the span to point at the use site.
481480
fn fix_multispans_in_extern_macros(
482481
&self,
483-
source_map: &Option<Lrc<SourceMap>>,
484482
span: &mut MultiSpan,
485483
children: &mut Vec<SubDiagnostic>,
486484
) {
487-
let Some(source_map) = source_map else { return };
488485
debug!("fix_multispans_in_extern_macros: before: span={:?} children={:?}", span, children);
489-
self.fix_multispan_in_extern_macros(source_map, span);
486+
self.fix_multispan_in_extern_macros(span);
490487
for child in children.iter_mut() {
491-
self.fix_multispan_in_extern_macros(source_map, &mut child.span);
488+
self.fix_multispan_in_extern_macros(&mut child.span);
492489
}
493490
debug!("fix_multispans_in_extern_macros: after: span={:?} children={:?}", span, children);
494491
}
495492

496493
// This "fixes" MultiSpans that contain `Span`s pointing to locations inside of external macros.
497494
// Since these locations are often difficult to read,
498495
// we move these spans from the external macros to their corresponding use site.
499-
fn fix_multispan_in_extern_macros(&self, source_map: &Lrc<SourceMap>, span: &mut MultiSpan) {
496+
fn fix_multispan_in_extern_macros(&self, span: &mut MultiSpan) {
497+
let Some(source_map) = self.source_map() else { return };
500498
// First, find all the spans in external macros and point instead at their use site.
501499
let replacements: Vec<(Span, Span)> = span
502500
.primary_spans()
@@ -544,7 +542,6 @@ impl Emitter for EmitterWriter {
544542
debug!("emit_diagnostic: suggestions={:?}", suggestions);
545543

546544
self.fix_multispans_in_extern_macros_and_render_macro_backtrace(
547-
&self.sm,
548545
&mut primary_span,
549546
&mut children,
550547
&diag.level,
@@ -2213,22 +2210,45 @@ impl FileWithAnnotatedLines {
22132210

22142211
if let Some(ref sm) = emitter.source_map() {
22152212
for span_label in msp.span_labels() {
2213+
let fixup_lo_hi = |span: Span| {
2214+
let lo = sm.lookup_char_pos(span.lo());
2215+
let mut hi = sm.lookup_char_pos(span.hi());
2216+
2217+
// Watch out for "empty spans". If we get a span like 6..6, we
2218+
// want to just display a `^` at 6, so convert that to
2219+
// 6..7. This is degenerate input, but it's best to degrade
2220+
// gracefully -- and the parser likes to supply a span like
2221+
// that for EOF, in particular.
2222+
2223+
if lo.col_display == hi.col_display && lo.line == hi.line {
2224+
hi.col_display += 1;
2225+
}
2226+
(lo, hi)
2227+
};
2228+
22162229
if span_label.span.is_dummy() {
2230+
if let Some(span) = msp.primary_span() {
2231+
// if we don't know where to render the annotation, emit it as a note
2232+
// on the primary span.
2233+
2234+
let (lo, hi) = fixup_lo_hi(span);
2235+
2236+
let ann = Annotation {
2237+
start_col: lo.col_display,
2238+
end_col: hi.col_display,
2239+
is_primary: span_label.is_primary,
2240+
label: span_label
2241+
.label
2242+
.as_ref()
2243+
.map(|m| emitter.translate_message(m, args).to_string()),
2244+
annotation_type: AnnotationType::Singleline,
2245+
};
2246+
add_annotation_to_file(&mut output, lo.file, lo.line, ann);
2247+
}
22172248
continue;
22182249
}
22192250

2220-
let lo = sm.lookup_char_pos(span_label.span.lo());
2221-
let mut hi = sm.lookup_char_pos(span_label.span.hi());
2222-
2223-
// Watch out for "empty spans". If we get a span like 6..6, we
2224-
// want to just display a `^` at 6, so convert that to
2225-
// 6..7. This is degenerate input, but it's best to degrade
2226-
// gracefully -- and the parser likes to supply a span like
2227-
// that for EOF, in particular.
2228-
2229-
if lo.col_display == hi.col_display && lo.line == hi.line {
2230-
hi.col_display += 1;
2231-
}
2251+
let (lo, hi) = fixup_lo_hi(span_label.span);
22322252

22332253
if lo.line != hi.line {
22342254
let ml = MultilineAnnotation {

‎compiler/rustc_passes/src/check_attr.rs

Lines changed: 42 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@ impl CheckAttrVisitor<'_> {
119119
}
120120
sym::naked => self.check_naked(hir_id, attr, span, target),
121121
sym::rustc_legacy_const_generics => {
122-
self.check_rustc_legacy_const_generics(&attr, span, target, item)
122+
self.check_rustc_legacy_const_generics(hir_id, &attr, span, target, item)
123123
}
124124
sym::rustc_lint_query_instability => {
125-
self.check_rustc_lint_query_instability(&attr, span, target)
125+
self.check_rustc_lint_query_instability(hir_id, &attr, span, target)
126126
}
127127
sym::rustc_lint_diagnostics => {
128-
self.check_rustc_lint_diagnostics(&attr, span, target)
128+
self.check_rustc_lint_diagnostics(hir_id, &attr, span, target)
129129
}
130130
sym::rustc_lint_opt_ty => self.check_rustc_lint_opt_ty(&attr, span, target),
131131
sym::rustc_lint_opt_deny_field_access => {
@@ -135,7 +135,9 @@ impl CheckAttrVisitor<'_> {
135135
| sym::rustc_dirty
136136
| sym::rustc_if_this_changed
137137
| sym::rustc_then_this_would_need => self.check_rustc_dirty_clean(&attr),
138-
sym::cmse_nonsecure_entry => self.check_cmse_nonsecure_entry(attr, span, target),
138+
sym::cmse_nonsecure_entry => {
139+
self.check_cmse_nonsecure_entry(hir_id, attr, span, target)
140+
}
139141
sym::collapse_debuginfo => self.check_collapse_debuginfo(attr, span, target),
140142
sym::const_trait => self.check_const_trait(attr, span, target),
141143
sym::must_not_suspend => self.check_must_not_suspend(&attr, span, target),
@@ -386,21 +388,29 @@ impl CheckAttrVisitor<'_> {
386388
self.tcx.sess.emit_err(errors::AttrShouldBeAppliedToFn {
387389
attr_span: attr.span,
388390
defn_span: span,
391+
on_crate: hir_id == CRATE_HIR_ID,
389392
});
390393
false
391394
}
392395
}
393396
}
394397

395398
/// Checks if `#[cmse_nonsecure_entry]` is applied to a function definition.
396-
fn check_cmse_nonsecure_entry(&self, attr: &Attribute, span: Span, target: Target) -> bool {
399+
fn check_cmse_nonsecure_entry(
400+
&self,
401+
hir_id: HirId,
402+
attr: &Attribute,
403+
span: Span,
404+
target: Target,
405+
) -> bool {
397406
match target {
398407
Target::Fn
399408
| Target::Method(MethodKind::Trait { body: true } | MethodKind::Inherent) => true,
400409
_ => {
401410
self.tcx.sess.emit_err(errors::AttrShouldBeAppliedToFn {
402411
attr_span: attr.span,
403412
defn_span: span,
413+
on_crate: hir_id == CRATE_HIR_ID,
404414
});
405415
false
406416
}
@@ -465,9 +475,11 @@ impl CheckAttrVisitor<'_> {
465475
true
466476
}
467477
_ => {
468-
self.tcx
469-
.sess
470-
.emit_err(errors::TrackedCallerWrongLocation { attr_span, defn_span: span });
478+
self.tcx.sess.emit_err(errors::TrackedCallerWrongLocation {
479+
attr_span,
480+
defn_span: span,
481+
on_crate: hir_id == CRATE_HIR_ID,
482+
});
471483
false
472484
}
473485
}
@@ -576,6 +588,7 @@ impl CheckAttrVisitor<'_> {
576588
self.tcx.sess.emit_err(errors::AttrShouldBeAppliedToFn {
577589
attr_span: attr.span,
578590
defn_span: span,
591+
on_crate: hir_id == CRATE_HIR_ID,
579592
});
580593
false
581594
}
@@ -1230,7 +1243,7 @@ impl CheckAttrVisitor<'_> {
12301243
UNUSED_ATTRIBUTES,
12311244
hir_id,
12321245
attr.span,
1233-
errors::Cold { span },
1246+
errors::Cold { span, on_crate: hir_id == CRATE_HIR_ID },
12341247
);
12351248
}
12361249
}
@@ -1366,6 +1379,7 @@ impl CheckAttrVisitor<'_> {
13661379
/// Checks if `#[rustc_legacy_const_generics]` is applied to a function and has a valid argument.
13671380
fn check_rustc_legacy_const_generics(
13681381
&self,
1382+
hir_id: HirId,
13691383
attr: &Attribute,
13701384
span: Span,
13711385
target: Target,
@@ -1376,6 +1390,7 @@ impl CheckAttrVisitor<'_> {
13761390
self.tcx.sess.emit_err(errors::AttrShouldBeAppliedToFn {
13771391
attr_span: attr.span,
13781392
defn_span: span,
1393+
on_crate: hir_id == CRATE_HIR_ID,
13791394
});
13801395
return false;
13811396
}
@@ -1440,12 +1455,19 @@ impl CheckAttrVisitor<'_> {
14401455

14411456
/// Helper function for checking that the provided attribute is only applied to a function or
14421457
/// method.
1443-
fn check_applied_to_fn_or_method(&self, attr: &Attribute, span: Span, target: Target) -> bool {
1458+
fn check_applied_to_fn_or_method(
1459+
&self,
1460+
hir_id: HirId,
1461+
attr: &Attribute,
1462+
span: Span,
1463+
target: Target,
1464+
) -> bool {
14441465
let is_function = matches!(target, Target::Fn | Target::Method(..));
14451466
if !is_function {
14461467
self.tcx.sess.emit_err(errors::AttrShouldBeAppliedToFn {
14471468
attr_span: attr.span,
14481469
defn_span: span,
1470+
on_crate: hir_id == CRATE_HIR_ID,
14491471
});
14501472
false
14511473
} else {
@@ -1457,17 +1479,24 @@ impl CheckAttrVisitor<'_> {
14571479
/// or method.
14581480
fn check_rustc_lint_query_instability(
14591481
&self,
1482+
hir_id: HirId,
14601483
attr: &Attribute,
14611484
span: Span,
14621485
target: Target,
14631486
) -> bool {
1464-
self.check_applied_to_fn_or_method(attr, span, target)
1487+
self.check_applied_to_fn_or_method(hir_id, attr, span, target)
14651488
}
14661489

14671490
/// Checks that the `#[rustc_lint_diagnostics]` attribute is only applied to a function or
14681491
/// method.
1469-
fn check_rustc_lint_diagnostics(&self, attr: &Attribute, span: Span, target: Target) -> bool {
1470-
self.check_applied_to_fn_or_method(attr, span, target)
1492+
fn check_rustc_lint_diagnostics(
1493+
&self,
1494+
hir_id: HirId,
1495+
attr: &Attribute,
1496+
span: Span,
1497+
target: Target,
1498+
) -> bool {
1499+
self.check_applied_to_fn_or_method(hir_id, attr, span, target)
14711500
}
14721501

14731502
/// Checks that the `#[rustc_lint_opt_ty]` attribute is only applied to a struct.

‎compiler/rustc_passes/src/errors.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ pub struct AttrShouldBeAppliedToFn {
8181
pub attr_span: Span,
8282
#[label]
8383
pub defn_span: Span,
84+
pub on_crate: bool,
8485
}
8586

8687
#[derive(Diagnostic)]
@@ -97,6 +98,7 @@ pub struct TrackedCallerWrongLocation {
9798
pub attr_span: Span,
9899
#[label]
99100
pub defn_span: Span,
101+
pub on_crate: bool,
100102
}
101103

102104
#[derive(Diagnostic)]
@@ -367,6 +369,7 @@ pub struct MustNotSuspend {
367369
pub struct Cold {
368370
#[label]
369371
pub span: Span,
372+
pub on_crate: bool,
370373
}
371374

372375
#[derive(LintDiagnostic)]

‎compiler/rustc_resolve/src/diagnostics.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,12 @@ impl<'a> Resolver<'a> {
241241
));
242242

243243
err.span_label(span, format!("`{}` re{} here", name, new_participle));
244-
err.span_label(
245-
self.session.source_map().guess_head_span(old_binding.span),
246-
format!("previous {} of the {} `{}` here", old_noun, old_kind, name),
247-
);
244+
if !old_binding.span.is_dummy() && old_binding.span != span {
245+
err.span_label(
246+
self.session.source_map().guess_head_span(old_binding.span),
247+
format!("previous {} of the {} `{}` here", old_noun, old_kind, name),
248+
);
249+
}
248250

249251
// See https://github.com/rust-lang/rust/issues/32354
250252
use NameBindingKind::Import;

‎compiler/rustc_resolve/src/late/diagnostics.rs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -807,14 +807,16 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
807807
err.code(rustc_errors::error_code!(E0411));
808808
err.span_label(span, "`Self` is only available in impls, traits, and type definitions");
809809
if let Some(item_kind) = self.diagnostic_metadata.current_item {
810-
err.span_label(
811-
item_kind.ident.span,
812-
format!(
813-
"`Self` not allowed in {} {}",
814-
item_kind.kind.article(),
815-
item_kind.kind.descr()
816-
),
817-
);
810+
if !item_kind.ident.span.is_dummy() {
811+
err.span_label(
812+
item_kind.ident.span,
813+
format!(
814+
"`Self` not allowed in {} {}",
815+
item_kind.kind.article(),
816+
item_kind.kind.descr()
817+
),
818+
);
819+
}
818820
}
819821
true
820822
}

‎compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2445,12 +2445,12 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
24452445
(Ok(l), Ok(r)) => l.line == r.line,
24462446
_ => true,
24472447
};
2448-
if !ident.span.overlaps(span) && !same_line {
2448+
if !ident.span.is_dummy() && !ident.span.overlaps(span) && !same_line {
24492449
multispan.push_span_label(ident.span, "required by a bound in this");
24502450
}
24512451
}
24522452
let descr = format!("required by a bound in `{}`", item_name);
2453-
if span != DUMMY_SP {
2453+
if !span.is_dummy() {
24542454
let msg = format!("required by this bound in `{}`", item_name);
24552455
multispan.push_span_label(span, msg);
24562456
err.span_note(multispan, &descr);

‎src/test/ui/asm/naked-invalid-attr.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ error: attribute should be applied to a function definition
3636
--> $DIR/naked-invalid-attr.rs:5:1
3737
|
3838
LL | #![naked]
39-
| ^^^^^^^^^
39+
| ^^^^^^^^^ cannot be applied to crates
4040

4141
error: aborting due to 5 previous errors
4242

‎src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,19 +110,19 @@ error: attribute should be applied to an `extern crate` item
110110
--> $DIR/issue-43106-gating-of-builtin-attrs-error.rs:25:1
111111
|
112112
LL | #![no_link]
113-
| ^^^^^^^^^^^
113+
| ^^^^^^^^^^^ not an `extern crate` item
114114

115115
error: attribute should be applied to a free function, impl method or static
116116
--> $DIR/issue-43106-gating-of-builtin-attrs-error.rs:27:1
117117
|
118118
LL | #![export_name = "2200"]
119-
| ^^^^^^^^^^^^^^^^^^^^^^^^
119+
| ^^^^^^^^^^^^^^^^^^^^^^^^ not a free function, impl method or static
120120

121121
error[E0518]: attribute should be applied to function or closure
122122
--> $DIR/issue-43106-gating-of-builtin-attrs-error.rs:29:1
123123
|
124124
LL | #![inline]
125-
| ^^^^^^^^^^
125+
| ^^^^^^^^^^ not a function or closure
126126

127127
error: `macro_export` attribute cannot be used at crate level
128128
--> $DIR/issue-43106-gating-of-builtin-attrs-error.rs:12:1

0 commit comments

Comments
 (0)