Skip to content

Commit e0e6f1d

Browse files
Dylan-DPCDylan-DPC
authored
Rollup merge of #98869 - compiler-errors:stop_guessing_head_span, r=cjgillot
Remove some usages of `guess_head_span` No need to pass things through `guess_head_span` if they already point to the head span. Only major change is that we point to the head span of `enum`s on some errors now, which I prefer. r? `@cjgillot`
2 parents a6d3ee3 + fcfb3e9 commit e0e6f1d

File tree

35 files changed

+162
-223
lines changed

35 files changed

+162
-223
lines changed

‎compiler/rustc_infer/src/infer/canonical/query_response.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -714,10 +714,7 @@ impl<'tcx> TypeRelatingDelegate<'tcx> for QueryTypeRelatingDelegate<'_, 'tcx> {
714714
}
715715

716716
fn const_equate(&mut self, _a: Const<'tcx>, _b: Const<'tcx>) {
717-
span_bug!(
718-
self.cause.span(self.infcx.tcx),
719-
"generic_const_exprs: unreachable `const_equate`"
720-
);
717+
span_bug!(self.cause.span(), "generic_const_exprs: unreachable `const_equate`");
721718
}
722719

723720
fn normalization() -> NormalizationStrategy {

‎compiler/rustc_infer/src/infer/error_reporting/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1435,7 +1435,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
14351435
swap_secondary_and_primary: bool,
14361436
force_label: bool,
14371437
) {
1438-
let span = cause.span(self.tcx);
1438+
let span = cause.span();
14391439

14401440
// For some types of errors, expected-found does not make
14411441
// sense, so just ignore the values we were given.
@@ -2085,7 +2085,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
20852085

20862086
debug!("report_and_explain_type_error(trace={:?}, terr={:?})", trace, terr);
20872087

2088-
let span = trace.cause.span(self.tcx);
2088+
let span = trace.cause.span();
20892089
let failure_code = trace.cause.as_failure_code(terr);
20902090
let mut diag = match failure_code {
20912091
FailureCode::Error0038(did) => {

‎compiler/rustc_infer/src/infer/error_reporting/nice_region_error/placeholder_error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ impl<'tcx> NiceRegionError<'_, 'tcx> {
204204
expected_substs: SubstsRef<'tcx>,
205205
actual_substs: SubstsRef<'tcx>,
206206
) -> DiagnosticBuilder<'tcx, ErrorGuaranteed> {
207-
let span = cause.span(self.tcx());
207+
let span = cause.span();
208208
let msg = format!(
209209
"implementation of `{}` is not general enough",
210210
self.tcx().def_path_str(trait_def_id),

‎compiler/rustc_infer/src/traits/error_reporting/mod.rs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,19 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
1818
trait_item_def_id: DefId,
1919
requirement: &dyn fmt::Display,
2020
) -> DiagnosticBuilder<'tcx, ErrorGuaranteed> {
21-
let msg = "impl has stricter requirements than trait";
22-
let sp = self.tcx.sess.source_map().guess_head_span(error_span);
21+
let mut err = struct_span_err!(
22+
self.tcx.sess,
23+
error_span,
24+
E0276,
25+
"impl has stricter requirements than trait"
26+
);
2327

24-
let mut err = struct_span_err!(self.tcx.sess, sp, E0276, "{}", msg);
25-
26-
if trait_item_def_id.is_local() {
28+
if let Some(span) = self.tcx.hir().span_if_local(trait_item_def_id) {
2729
let item_name = self.tcx.item_name(impl_item_def_id.to_def_id());
28-
err.span_label(
29-
self.tcx.def_span(trait_item_def_id),
30-
format!("definition of `{}` from trait", item_name),
31-
);
30+
err.span_label(span, format!("definition of `{}` from trait", item_name));
3231
}
3332

34-
err.span_label(sp, format!("impl has extra requirement {}", requirement));
33+
err.span_label(error_span, format!("impl has extra requirement {}", requirement));
3534

3635
err
3736
}
@@ -48,7 +47,6 @@ pub fn report_object_safety_error<'tcx>(
4847
hir::Node::Item(item) => Some(item.ident.span),
4948
_ => None,
5049
});
51-
let span = tcx.sess.source_map().guess_head_span(span);
5250
let mut err = struct_span_err!(
5351
tcx.sess,
5452
span,

‎compiler/rustc_lint/src/context.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,9 +694,8 @@ pub trait LintContext: Sized {
694694
}
695695

696696
if let Some(span) = in_test_module {
697-
let def_span = self.sess().source_map().guess_head_span(span);
698697
db.span_help(
699-
span.shrink_to_lo().to(def_span),
698+
self.sess().source_map().guess_head_span(span),
700699
"consider adding a `#[cfg(test)]` to the containing module",
701700
);
702701
}

‎compiler/rustc_middle/src/traits/mod.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,8 @@ impl<'tcx> ObligationCause<'tcx> {
139139
ObligationCause { span, body_id: hir::CRATE_HIR_ID, code: Default::default() }
140140
}
141141

142-
pub fn span(&self, tcx: TyCtxt<'tcx>) -> Span {
142+
pub fn span(&self) -> Span {
143143
match *self.code() {
144-
ObligationCauseCode::CompareImplMethodObligation { .. }
145-
| ObligationCauseCode::MainFunctionType
146-
| ObligationCauseCode::StartFunctionType => {
147-
tcx.sess.source_map().guess_head_span(self.span)
148-
}
149144
ObligationCauseCode::MatchExpressionArm(box MatchExpressionArmCause {
150145
arm_span,
151146
..

‎compiler/rustc_privacy/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1759,8 +1759,7 @@ impl SearchInterfaceForPrivateItemsVisitor<'_> {
17591759
|| self.tcx.resolutions(()).has_pub_restricted
17601760
{
17611761
let descr = descr.to_string();
1762-
let vis_span =
1763-
self.tcx.sess.source_map().guess_head_span(self.tcx.def_span(def_id));
1762+
let vis_span = self.tcx.def_span(def_id);
17641763
if kind == "trait" {
17651764
self.tcx.sess.emit_err(InPublicInterfaceTraits {
17661765
span,

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -823,10 +823,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
823823

824824
ty::PredicateKind::ClosureKind(closure_def_id, closure_substs, kind) => {
825825
let found_kind = self.closure_kind(closure_substs).unwrap();
826-
let closure_span =
827-
self.tcx.sess.source_map().guess_head_span(
828-
self.tcx.hir().span_if_local(closure_def_id).unwrap(),
829-
);
826+
let closure_span = self.tcx.def_span(closure_def_id);
830827
let mut err = struct_span_err!(
831828
self.tcx.sess,
832829
closure_span,
@@ -951,9 +948,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
951948
_ => None,
952949
};
953950

954-
let found_span = found_did
955-
.and_then(|did| self.tcx.hir().span_if_local(did))
956-
.map(|sp| self.tcx.sess.source_map().guess_head_span(sp)); // the sp could be an fn def
951+
let found_span = found_did.and_then(|did| self.tcx.hir().span_if_local(did));
957952

958953
if self.reported_closure_mismatch.borrow().contains(&(span, found_span)) {
959954
// We check closures twice, with obligations flowing in different directions,
@@ -1089,7 +1084,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
10891084
kind: hir::ExprKind::Closure(&hir::Closure { body, fn_decl_span, .. }),
10901085
..
10911086
}) => (
1092-
sm.guess_head_span(fn_decl_span),
1087+
fn_decl_span,
10931088
hir.body(body)
10941089
.params
10951090
.iter()

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1543,7 +1543,6 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
15431543
ty::Generator(..) => "generator",
15441544
_ => "function",
15451545
};
1546-
let span = self.tcx.sess.source_map().guess_head_span(span);
15471546
let mut err = struct_span_err!(
15481547
self.tcx.sess,
15491548
span,

‎compiler/rustc_trait_selection/src/traits/fulfill.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ impl<'a, 'b, 'tcx> ObligationProcessor for FulfillProcessor<'a, 'b, 'tcx> {
603603
),
604604
(Err(ErrorHandled::Linted), _) | (_, Err(ErrorHandled::Linted)) => {
605605
span_bug!(
606-
obligation.cause.span(self.selcx.tcx()),
606+
obligation.cause.span(),
607607
"ConstEquate: const_eval_resolve returned an unexpected error"
608608
)
609609
}

‎compiler/rustc_trait_selection/src/traits/query/evaluate_obligation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ impl<'cx, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'cx, 'tcx> {
8484
// Run canonical query. If overflow occurs, rerun from scratch but this time
8585
// in standard trait query mode so that overflow is handled appropriately
8686
// within `SelectionContext`.
87-
self.tcx.at(obligation.cause.span(self.tcx)).evaluate_obligation(c_pred)
87+
self.tcx.at(obligation.cause.span()).evaluate_obligation(c_pred)
8888
}
8989

9090
// Helper function that canonicalizes and runs the query. If an

‎compiler/rustc_trait_selection/src/traits/select/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
742742
| (_, Err(ErrorHandled::Reported(_))) => Ok(EvaluatedToErr),
743743
(Err(ErrorHandled::Linted), _) | (_, Err(ErrorHandled::Linted)) => {
744744
span_bug!(
745-
obligation.cause.span(self.tcx()),
745+
obligation.cause.span(),
746746
"ConstEquate: const_eval_resolve returned an unexpected error"
747747
)
748748
}

‎compiler/rustc_typeck/src/astconv/mod.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1958,11 +1958,8 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
19581958
);
19591959
}
19601960

1961-
if adt_def.did().is_local() {
1962-
err.span_label(
1963-
tcx.def_span(adt_def.did()),
1964-
format!("variant `{assoc_ident}` not found for this enum"),
1965-
);
1961+
if let Some(sp) = tcx.hir().span_if_local(adt_def.did()) {
1962+
err.span_label(sp, format!("variant `{}` not found here", assoc_ident));
19661963
}
19671964

19681965
err.emit()

‎compiler/rustc_typeck/src/check/_match.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::check::coercion::{AsCoercionSite, CoerceMany};
22
use crate::check::{Diverges, Expectation, FnCtxt, Needs};
3-
use rustc_errors::{Applicability, Diagnostic, MultiSpan};
3+
use rustc_errors::{Applicability, MultiSpan};
44
use rustc_hir::{self as hir, ExprKind};
55
use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
66
use rustc_infer::traits::Obligation;
@@ -127,7 +127,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
127127
&cause,
128128
Some(&arm.body),
129129
arm_ty,
130-
Some(&mut |err: &mut Diagnostic| {
130+
Some(&mut |err| {
131131
let Some(ret) = self.ret_type_span else {
132132
return;
133133
};

‎compiler/rustc_typeck/src/check/check.rs

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,9 @@ fn check_alloc_error_fn(
375375
}
376376
}
377377

378-
fn check_struct(tcx: TyCtxt<'_>, def_id: LocalDefId, span: Span) {
378+
fn check_struct(tcx: TyCtxt<'_>, def_id: LocalDefId) {
379379
let def = tcx.adt_def(def_id);
380+
let span = tcx.def_span(def_id);
380381
def.destructor(tcx); // force the destructor to be evaluated
381382
check_representable(tcx, span, def_id);
382383

@@ -388,8 +389,9 @@ fn check_struct(tcx: TyCtxt<'_>, def_id: LocalDefId, span: Span) {
388389
check_packed(tcx, span, def);
389390
}
390391

391-
fn check_union(tcx: TyCtxt<'_>, def_id: LocalDefId, span: Span) {
392+
fn check_union(tcx: TyCtxt<'_>, def_id: LocalDefId) {
392393
let def = tcx.adt_def(def_id);
394+
let span = tcx.def_span(def_id);
393395
def.destructor(tcx); // force the destructor to be evaluated
394396
check_representable(tcx, span, def_id);
395397
check_transparent(tcx, span, def);
@@ -471,13 +473,14 @@ fn check_union_fields(tcx: TyCtxt<'_>, span: Span, item_def_id: LocalDefId) -> b
471473
}
472474

473475
/// Check that a `static` is inhabited.
474-
fn check_static_inhabited<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId, span: Span) {
476+
fn check_static_inhabited<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId) {
475477
// Make sure statics are inhabited.
476478
// Other parts of the compiler assume that there are no uninhabited places. In principle it
477479
// would be enough to check this for `extern` statics, as statics with an initializer will
478480
// have UB during initialization if they are uninhabited, but there also seems to be no good
479481
// reason to allow any statics to be uninhabited.
480482
let ty = tcx.type_of(def_id);
483+
let span = tcx.def_span(def_id);
481484
let layout = match tcx.layout_of(ParamEnv::reveal_all().and(ty)) {
482485
Ok(l) => l,
483486
// Foreign statics that overflow their allowed size should emit an error
@@ -524,9 +527,9 @@ pub(super) fn check_opaque<'tcx>(
524527
tcx: TyCtxt<'tcx>,
525528
def_id: LocalDefId,
526529
substs: SubstsRef<'tcx>,
527-
span: Span,
528530
origin: &hir::OpaqueTyOrigin,
529531
) {
532+
let span = tcx.def_span(def_id);
530533
check_opaque_for_inheriting_lifetimes(tcx, def_id, span);
531534
if tcx.type_of(def_id).references_error() {
532535
return;
@@ -785,8 +788,8 @@ fn check_item_type<'tcx>(tcx: TyCtxt<'tcx>, id: hir::ItemId) {
785788
match tcx.def_kind(id.def_id) {
786789
DefKind::Static(..) => {
787790
tcx.ensure().typeck(id.def_id);
788-
maybe_check_static_with_link_section(tcx, id.def_id, tcx.def_span(id.def_id));
789-
check_static_inhabited(tcx, id.def_id, tcx.def_span(id.def_id));
791+
maybe_check_static_with_link_section(tcx, id.def_id);
792+
check_static_inhabited(tcx, id.def_id);
790793
}
791794
DefKind::Const => {
792795
tcx.ensure().typeck(id.def_id);
@@ -796,7 +799,7 @@ fn check_item_type<'tcx>(tcx: TyCtxt<'tcx>, id: hir::ItemId) {
796799
let hir::ItemKind::Enum(ref enum_definition, _) = item.kind else {
797800
return;
798801
};
799-
check_enum(tcx, item.span, &enum_definition.variants, item.def_id);
802+
check_enum(tcx, &enum_definition.variants, item.def_id);
800803
}
801804
DefKind::Fn => {} // entirely within check_item_body
802805
DefKind::Impl => {
@@ -847,10 +850,10 @@ fn check_item_type<'tcx>(tcx: TyCtxt<'tcx>, id: hir::ItemId) {
847850
}
848851
}
849852
DefKind::Struct => {
850-
check_struct(tcx, id.def_id, tcx.def_span(id.def_id));
853+
check_struct(tcx, id.def_id);
851854
}
852855
DefKind::Union => {
853-
check_union(tcx, id.def_id, tcx.def_span(id.def_id));
856+
check_union(tcx, id.def_id);
854857
}
855858
DefKind::OpaqueTy => {
856859
let item = tcx.hir().item(id);
@@ -863,7 +866,7 @@ fn check_item_type<'tcx>(tcx: TyCtxt<'tcx>, id: hir::ItemId) {
863866
// See https://github.com/rust-lang/rust/issues/75100
864867
if !tcx.sess.opts.actually_rustdoc {
865868
let substs = InternalSubsts::identity_for_item(tcx, item.def_id.to_def_id());
866-
check_opaque(tcx, item.def_id, substs, item.span, &origin);
869+
check_opaque(tcx, item.def_id, substs, &origin);
867870
}
868871
}
869872
DefKind::TyAlias => {
@@ -927,7 +930,7 @@ fn check_item_type<'tcx>(tcx: TyCtxt<'tcx>, id: hir::ItemId) {
927930
require_c_abi_if_c_variadic(tcx, fn_decl, abi, item.span);
928931
}
929932
hir::ForeignItemKind::Static(..) => {
930-
check_static_inhabited(tcx, def_id, item.span);
933+
check_static_inhabited(tcx, def_id);
931934
}
932935
_ => {}
933936
}
@@ -1328,7 +1331,6 @@ pub(super) fn check_transparent<'tcx>(tcx: TyCtxt<'tcx>, sp: Span, adt: ty::AdtD
13281331
if !adt.repr().transparent() {
13291332
return;
13301333
}
1331-
let sp = tcx.sess.source_map().guess_head_span(sp);
13321334

13331335
if adt.is_union() && !tcx.features().transparent_unions {
13341336
feature_err(
@@ -1442,13 +1444,9 @@ pub(super) fn check_transparent<'tcx>(tcx: TyCtxt<'tcx>, sp: Span, adt: ty::AdtD
14421444
}
14431445

14441446
#[allow(trivial_numeric_casts)]
1445-
fn check_enum<'tcx>(
1446-
tcx: TyCtxt<'tcx>,
1447-
sp: Span,
1448-
vs: &'tcx [hir::Variant<'tcx>],
1449-
def_id: LocalDefId,
1450-
) {
1447+
fn check_enum<'tcx>(tcx: TyCtxt<'tcx>, vs: &'tcx [hir::Variant<'tcx>], def_id: LocalDefId) {
14511448
let def = tcx.adt_def(def_id);
1449+
let sp = tcx.def_span(def_id);
14521450
def.destructor(tcx); // force the destructor to be evaluated
14531451

14541452
if vs.is_empty() {

0 commit comments

Comments
 (0)