Skip to content

Commit 6733bc3

Browse files
cjgillotcjgillot
committed
Remove guess_head_span.
1 parent 36f4f4a commit 6733bc3

File tree

20 files changed

+93
-103
lines changed

20 files changed

+93
-103
lines changed

‎compiler/rustc_lint/src/builtin.rs

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1364,7 +1364,6 @@ impl UnreachablePub {
13641364
cx: &LateContext<'_>,
13651365
what: &str,
13661366
def_id: LocalDefId,
1367-
span: Span,
13681367
vis_span: Span,
13691368
exportable: bool,
13701369
) {
@@ -1373,7 +1372,7 @@ impl UnreachablePub {
13731372
if vis_span.from_expansion() {
13741373
applicability = Applicability::MaybeIncorrect;
13751374
}
1376-
let def_span = cx.tcx.sess.source_map().guess_head_span(span);
1375+
let def_span = cx.tcx.def_span(def_id);
13771376
cx.struct_span_lint(UNREACHABLE_PUB, def_span, |lint| {
13781377
let mut err = lint.build(fluent::lint::builtin_unreachable_pub);
13791378
err.set_arg("what", what);
@@ -1399,36 +1398,22 @@ impl<'tcx> LateLintPass<'tcx> for UnreachablePub {
13991398
if let hir::ItemKind::Use(_, hir::UseKind::ListStem) = &item.kind {
14001399
return;
14011400
}
1402-
self.perform_lint(cx, "item", item.def_id, item.span, item.vis_span, true);
1401+
self.perform_lint(cx, "item", item.def_id, item.vis_span, true);
14031402
}
14041403

14051404
fn check_foreign_item(&mut self, cx: &LateContext<'_>, foreign_item: &hir::ForeignItem<'tcx>) {
1406-
self.perform_lint(
1407-
cx,
1408-
"item",
1409-
foreign_item.def_id,
1410-
foreign_item.span,
1411-
foreign_item.vis_span,
1412-
true,
1413-
);
1405+
self.perform_lint(cx, "item", foreign_item.def_id, foreign_item.vis_span, true);
14141406
}
14151407

14161408
fn check_field_def(&mut self, cx: &LateContext<'_>, field: &hir::FieldDef<'_>) {
14171409
let def_id = cx.tcx.hir().local_def_id(field.hir_id);
1418-
self.perform_lint(cx, "field", def_id, field.span, field.vis_span, false);
1410+
self.perform_lint(cx, "field", def_id, field.vis_span, false);
14191411
}
14201412

14211413
fn check_impl_item(&mut self, cx: &LateContext<'_>, impl_item: &hir::ImplItem<'_>) {
14221414
// Only lint inherent impl items.
14231415
if cx.tcx.associated_item(impl_item.def_id).trait_item_def_id.is_none() {
1424-
self.perform_lint(
1425-
cx,
1426-
"item",
1427-
impl_item.def_id,
1428-
impl_item.span,
1429-
impl_item.vis_span,
1430-
false,
1431-
);
1416+
self.perform_lint(cx, "item", impl_item.def_id, impl_item.vis_span, false);
14321417
}
14331418
}
14341419
}

‎compiler/rustc_mir_build/src/lints.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ pub(crate) fn check<'tcx>(tcx: TyCtxt<'tcx>, body: &Body<'tcx>) {
4141

4242
vis.reachable_recursive_calls.sort();
4343

44+
let sp = tcx.def_span(def_id);
4445
let hir_id = tcx.hir().local_def_id_to_hir_id(def_id);
45-
let sp = tcx.sess.source_map().guess_head_span(tcx.hir().span_with_body(hir_id));
4646
tcx.struct_span_lint_hir(UNCONDITIONAL_RECURSION, hir_id, sp, |lint| {
4747
let mut db = lint.build("function cannot return without recursing");
4848
db.span_label(sp, "cannot return without recursing");

‎compiler/rustc_privacy/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,8 +1754,7 @@ impl SearchInterfaceForPrivateItemsVisitor<'_> {
17541754
|| self.in_assoc_ty
17551755
|| self.tcx.resolutions(()).has_pub_restricted
17561756
{
1757-
let vis_span =
1758-
self.tcx.sess.source_map().guess_head_span(self.tcx.def_span(def_id));
1757+
let vis_span = self.tcx.def_span(def_id);
17591758
if kind == "trait" {
17601759
self.tcx.sess.emit_err(InPublicInterfaceTraits {
17611760
span,

‎compiler/rustc_query_system/src/query/job.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use crate::dep_graph::DepContext;
21
use crate::query::plumbing::CycleError;
32
use crate::query::{QueryContext, QueryStackFrame};
43
use rustc_hir::def::DefKind;
@@ -536,9 +535,7 @@ pub(crate) fn report_cycle<'a>(
536535
) -> DiagnosticBuilder<'a, ErrorGuaranteed> {
537536
assert!(!stack.is_empty());
538537

539-
let fix_span = |span: Span, query: &QueryStackFrame| {
540-
sess.source_map().guess_head_span(query.default_span(span))
541-
};
538+
let fix_span = |span: Span, query: &QueryStackFrame| query.default_span(span);
542539

543540
let span = fix_span(stack[1 % stack.len()].span, &stack[0].query);
544541
let mut err =
@@ -606,8 +603,7 @@ pub fn print_query_stack<CTX: QueryContext>(
606603
Level::FailureNote,
607604
&format!("#{} [{}] {}", i, query_info.query.name, query_info.query.description),
608605
);
609-
diag.span =
610-
tcx.dep_context().sess().source_map().guess_head_span(query_info.job.span).into();
606+
diag.span = query_info.job.span.into();
611607
handler.force_print_diagnostic(diag);
612608

613609
current_query = query_info.job.parent;

‎compiler/rustc_resolve/src/diagnostics.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1587,11 +1587,7 @@ impl<'a> Resolver<'a> {
15871587
};
15881588
let def_span = suggestion.res.opt_def_id().and_then(|def_id| match def_id.krate {
15891589
LOCAL_CRATE => self.opt_span(def_id),
1590-
_ => Some(
1591-
self.session
1592-
.source_map()
1593-
.guess_head_span(self.cstore().get_span_untracked(def_id, self.session)),
1594-
),
1590+
_ => Some(self.cstore().get_span_untracked(def_id, self.session)),
15951591
});
15961592
if let Some(def_span) = def_span {
15971593
if span.overlaps(def_span) {

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
136136
fn def_span(&self, def_id: DefId) -> Option<Span> {
137137
match def_id.krate {
138138
LOCAL_CRATE => self.r.opt_span(def_id),
139-
_ => Some(
140-
self.r
141-
.session
142-
.source_map()
143-
.guess_head_span(self.r.cstore().get_span_untracked(def_id, self.r.session)),
144-
),
139+
_ => Some(self.r.cstore().get_span_untracked(def_id, self.r.session)),
145140
}
146141
}
147142

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1933,7 +1933,6 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
19331933
));
19341934

19351935
let original_span = err.span.primary_span().unwrap();
1936-
let original_span = self.tcx.sess.source_map().guess_head_span(original_span);
19371936
let mut span = MultiSpan::from_span(original_span);
19381937

19391938
let message = outer_generator

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
292292
pub(crate) fn if_cause(
293293
&self,
294294
span: Span,
295+
cond_span: Span,
295296
then_expr: &'tcx hir::Expr<'tcx>,
296297
else_expr: &'tcx hir::Expr<'tcx>,
297298
then_ty: Ty<'tcx>,
@@ -354,10 +355,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
354355
// 6 | | };
355356
// | |_____^ expected integer, found `()`
356357
// ```
357-
if block.expr.is_none() && block.stmts.is_empty()
358-
&& let Some(outer_span) = &mut outer_span
359-
{
360-
*outer_span = self.tcx.sess.source_map().guess_head_span(*outer_span);
358+
if block.expr.is_none() && block.stmts.is_empty() && outer_span.is_some() {
359+
let sp = if let Some(cs) = cond_span.find_ancestor_inside(span) {
360+
span.with_hi(cs.hi())
361+
} else {
362+
span
363+
};
364+
outer_span = Some(sp);
361365
}
362366

363367
(self.find_block_span(block), block.hir_id)

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,8 +1003,15 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
10031003
let else_diverges = self.diverges.get();
10041004

10051005
let opt_suggest_box_span = self.opt_suggest_box_span(else_ty, orig_expected);
1006-
let if_cause =
1007-
self.if_cause(sp, then_expr, else_expr, then_ty, else_ty, opt_suggest_box_span);
1006+
let if_cause = self.if_cause(
1007+
sp,
1008+
cond_expr.span,
1009+
then_expr,
1010+
else_expr,
1011+
then_ty,
1012+
else_ty,
1013+
opt_suggest_box_span,
1014+
);
10081015

10091016
coerce.coerce(self, &if_cause, else_expr, else_ty);
10101017

‎src/test/ui/async-await/no-const-async.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ note: cycle used when checking item types in top-level module
3535
--> $DIR/no-const-async.rs:4:1
3636
|
3737
LL | pub const async fn x() {}
38-
| ^^^^^^^^^^^^^^^^^^^^^^
38+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
3939

4040
error: aborting due to 2 previous errors
4141

0 commit comments

Comments
 (0)