Skip to content

Commit 9a9b5a1

Browse files
nnethercotennethercote
committed
Remove ParseSess methods that duplicate DiagCtxt methods.
Also add missing `#[track_caller]` attributes to `DiagCtxt` methods as necessary to keep tests working.
1 parent 1a4d69c commit 9a9b5a1

File tree

22 files changed

+257
-315
lines changed

22 files changed

+257
-315
lines changed

‎compiler/rustc_attr/src/builtin.rs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,7 @@ pub fn eval_condition(
588588
features: Option<&Features>,
589589
eval: &mut impl FnMut(Condition) -> bool,
590590
) -> bool {
591+
let dcx = &sess.dcx;
591592
match &cfg.kind {
592593
ast::MetaItemKind::List(mis) if cfg.name_or_empty() == sym::version => {
593594
try_gate_cfg(sym::version, cfg.span, sess, features);
@@ -599,18 +600,18 @@ pub fn eval_condition(
599600
NestedMetaItem::Lit(MetaItemLit { span, .. })
600601
| NestedMetaItem::MetaItem(MetaItem { span, .. }),
601602
] => {
602-
sess.emit_err(session_diagnostics::ExpectedVersionLiteral { span: *span });
603+
dcx.emit_err(session_diagnostics::ExpectedVersionLiteral { span: *span });
603604
return false;
604605
}
605606
[..] => {
606-
sess.emit_err(session_diagnostics::ExpectedSingleVersionLiteral {
607+
dcx.emit_err(session_diagnostics::ExpectedSingleVersionLiteral {
607608
span: cfg.span,
608609
});
609610
return false;
610611
}
611612
};
612613
let Some(min_version) = parse_version(*min_version) else {
613-
sess.emit_warning(session_diagnostics::UnknownVersionLiteral { span: *span });
614+
dcx.emit_warning(session_diagnostics::UnknownVersionLiteral { span: *span });
614615
return false;
615616
};
616617

@@ -624,7 +625,7 @@ pub fn eval_condition(
624625
ast::MetaItemKind::List(mis) => {
625626
for mi in mis.iter() {
626627
if !mi.is_meta_item() {
627-
sess.emit_err(session_diagnostics::UnsupportedLiteral {
628+
dcx.emit_err(session_diagnostics::UnsupportedLiteral {
628629
span: mi.span(),
629630
reason: UnsupportedLiteralReason::Generic,
630631
is_bytestr: false,
@@ -653,9 +654,7 @@ pub fn eval_condition(
653654
}),
654655
sym::not => {
655656
if mis.len() != 1 {
656-
sess.emit_err(session_diagnostics::ExpectedOneCfgPattern {
657-
span: cfg.span,
658-
});
657+
dcx.emit_err(session_diagnostics::ExpectedOneCfgPattern { span: cfg.span });
659658
return false;
660659
}
661660

@@ -684,7 +683,7 @@ pub fn eval_condition(
684683
})
685684
}
686685
_ => {
687-
sess.emit_err(session_diagnostics::InvalidPredicate {
686+
dcx.emit_err(session_diagnostics::InvalidPredicate {
688687
span: cfg.span,
689688
predicate: pprust::path_to_string(&cfg.path),
690689
});
@@ -693,11 +692,11 @@ pub fn eval_condition(
693692
}
694693
}
695694
ast::MetaItemKind::Word | MetaItemKind::NameValue(..) if cfg.path.segments.len() != 1 => {
696-
sess.emit_err(session_diagnostics::CfgPredicateIdentifier { span: cfg.path.span });
695+
dcx.emit_err(session_diagnostics::CfgPredicateIdentifier { span: cfg.path.span });
697696
true
698697
}
699698
MetaItemKind::NameValue(lit) if !lit.kind.is_str() => {
700-
sess.emit_err(session_diagnostics::UnsupportedLiteral {
699+
dcx.emit_err(session_diagnostics::UnsupportedLiteral {
701700
span: lit.span,
702701
reason: UnsupportedLiteralReason::CfgString,
703702
is_bytestr: lit.kind.is_bytestr(),
@@ -945,7 +944,7 @@ pub fn parse_repr_attr(sess: &Session, attr: &Attribute) -> Vec<ReprAttr> {
945944
assert!(attr.has_name(sym::repr), "expected `#[repr(..)]`, found: {attr:?}");
946945
use ReprAttr::*;
947946
let mut acc = Vec::new();
948-
let diagnostic = sess.dcx();
947+
let dcx = sess.dcx();
949948

950949
if let Some(items) = attr.meta_item_list() {
951950
for item in items {
@@ -1062,7 +1061,7 @@ pub fn parse_repr_attr(sess: &Session, attr: &Attribute) -> Vec<ReprAttr> {
10621061
// (e.g. if we only pretty-print the source), so we have to gate
10631062
// the `span_delayed_bug` call as follows:
10641063
if sess.opts.pretty.map_or(true, |pp| pp.needs_analysis()) {
1065-
diagnostic.span_delayed_bug(item.span(), "unrecognized representation hint");
1064+
dcx.span_delayed_bug(item.span(), "unrecognized representation hint");
10661065
}
10671066
}
10681067
}

‎compiler/rustc_builtin_macros/src/asm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ fn parse_reg<'a>(
422422
ast::InlineAsmRegOrRegClass::Reg(symbol)
423423
}
424424
_ => {
425-
return Err(p.sess.create_err(errors::ExpectedRegisterClassOrExplicitRegister {
425+
return Err(p.dcx().create_err(errors::ExpectedRegisterClassOrExplicitRegister {
426426
span: p.token.span,
427427
}));
428428
}

‎compiler/rustc_errors/src/lib.rs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1272,6 +1272,7 @@ impl DiagCtxt {
12721272
self.inner.borrow_mut().emit_diagnostic_without_consuming(diagnostic)
12731273
}
12741274

1275+
#[track_caller]
12751276
pub fn emit_err<'a>(&'a self, err: impl IntoDiagnostic<'a>) -> ErrorGuaranteed {
12761277
self.create_err(err).emit()
12771278
}
@@ -1284,57 +1285,67 @@ impl DiagCtxt {
12841285
err.into_diagnostic(self, Level::Error { lint: false })
12851286
}
12861287

1288+
#[track_caller]
12871289
pub fn create_warning<'a>(
12881290
&'a self,
12891291
warning: impl IntoDiagnostic<'a, ()>,
12901292
) -> DiagnosticBuilder<'a, ()> {
12911293
warning.into_diagnostic(self, Level::Warning(None))
12921294
}
12931295

1296+
#[track_caller]
12941297
pub fn emit_warning<'a>(&'a self, warning: impl IntoDiagnostic<'a, ()>) {
12951298
self.create_warning(warning).emit()
12961299
}
12971300

1301+
#[track_caller]
12981302
pub fn create_almost_fatal<'a>(
12991303
&'a self,
13001304
fatal: impl IntoDiagnostic<'a, FatalError>,
13011305
) -> DiagnosticBuilder<'a, FatalError> {
13021306
fatal.into_diagnostic(self, Level::Fatal)
13031307
}
13041308

1309+
#[track_caller]
13051310
pub fn emit_almost_fatal<'a>(
13061311
&'a self,
13071312
fatal: impl IntoDiagnostic<'a, FatalError>,
13081313
) -> FatalError {
13091314
self.create_almost_fatal(fatal).emit()
13101315
}
13111316

1317+
#[track_caller]
13121318
pub fn create_fatal<'a>(
13131319
&'a self,
13141320
fatal: impl IntoDiagnostic<'a, FatalAbort>,
13151321
) -> DiagnosticBuilder<'a, FatalAbort> {
13161322
fatal.into_diagnostic(self, Level::Fatal)
13171323
}
13181324

1325+
#[track_caller]
13191326
pub fn emit_fatal<'a>(&'a self, fatal: impl IntoDiagnostic<'a, FatalAbort>) -> ! {
13201327
self.create_fatal(fatal).emit()
13211328
}
13221329

1330+
#[track_caller]
13231331
pub fn create_bug<'a>(
13241332
&'a self,
13251333
bug: impl IntoDiagnostic<'a, BugAbort>,
13261334
) -> DiagnosticBuilder<'a, BugAbort> {
13271335
bug.into_diagnostic(self, Level::Bug)
13281336
}
13291337

1330-
pub fn emit_bug<'a>(&'a self, bug: impl IntoDiagnostic<'a, BugAbort>) -> ! {
1338+
#[track_caller]
1339+
pub fn emit_bug<'a>(&'a self, bug: impl IntoDiagnostic<'a, diagnostic_builder::BugAbort>) -> ! {
13311340
self.create_bug(bug).emit()
13321341
}
13331342

1343+
#[track_caller]
13341344
pub fn emit_note<'a>(&'a self, note: impl IntoDiagnostic<'a, ()>) {
13351345
self.create_note(note).emit()
13361346
}
13371347

1348+
#[track_caller]
13381349
pub fn create_note<'a>(
13391350
&'a self,
13401351
note: impl IntoDiagnostic<'a, ()>,

‎compiler/rustc_expand/src/base.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,7 @@ impl<'a> ExtCtxt<'a> {
11151115

11161116
pub fn trace_macros_diag(&mut self) {
11171117
for (span, notes) in self.expansions.iter() {
1118-
let mut db = self.sess.parse_sess.create_note(errors::TraceMacro { span: *span });
1118+
let mut db = self.dcx().create_note(errors::TraceMacro { span: *span });
11191119
for note in notes {
11201120
db.note(note.clone());
11211121
}

‎compiler/rustc_expand/src/expand.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,7 @@ pub fn ensure_complete_parse<'a>(
10831083

10841084
let expands_to_match_arm = kind_name == "pattern" && parser.token == token::FatArrow;
10851085

1086-
parser.sess.emit_err(IncompleteParse {
1086+
parser.dcx().emit_err(IncompleteParse {
10871087
span: def_site_span,
10881088
token,
10891089
label_span: span,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,6 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
9090
},
9191
None => ExplicitLifetimeRequired::WithParamType { span, named, new_ty_span, new_ty },
9292
};
93-
Some(self.tcx().sess.parse_sess.create_err(err))
93+
Some(self.tcx().sess.dcx().create_err(err))
9494
}
9595
}

‎compiler/rustc_parse/src/lexer/mod.rs

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use rustc_ast::token::{self, CommentKind, Delimiter, Token, TokenKind};
88
use rustc_ast::tokenstream::TokenStream;
99
use rustc_ast::util::unicode::contains_text_flow_control_chars;
1010
use rustc_errors::{
11-
error_code, Applicability, Diagnostic, DiagnosticBuilder, FatalAbort, StashKey,
11+
error_code, Applicability, DiagCtxt, Diagnostic, DiagnosticBuilder, FatalAbort, StashKey,
1212
};
1313
use rustc_lexer::unescape::{self, EscapeError, Mode};
1414
use rustc_lexer::{Base, DocStyle, RawStrError};
@@ -110,6 +110,10 @@ struct StringReader<'a> {
110110
}
111111

112112
impl<'a> StringReader<'a> {
113+
pub fn dcx(&self) -> &'a DiagCtxt {
114+
&self.sess.dcx
115+
}
116+
113117
fn mk_sp(&self, lo: BytePos, hi: BytePos) -> Span {
114118
self.override_span.unwrap_or_else(|| Span::with_root_ctxt(lo, hi))
115119
}
@@ -176,7 +180,7 @@ impl<'a> StringReader<'a> {
176180
let span = self.mk_sp(start, self.pos);
177181
self.sess.symbol_gallery.insert(sym, span);
178182
if !sym.can_be_raw() {
179-
self.sess.emit_err(errors::CannotBeRawIdent { span, ident: sym });
183+
self.dcx().emit_err(errors::CannotBeRawIdent { span, ident: sym });
180184
}
181185
self.sess.raw_identifier_spans.push(span);
182186
token::Ident(sym, true)
@@ -247,7 +251,7 @@ impl<'a> StringReader<'a> {
247251
let lifetime_name = self.str_from(start);
248252
if starts_with_number {
249253
let span = self.mk_sp(start, self.pos);
250-
let mut diag = self.sess.struct_err("lifetimes cannot start with a number");
254+
let mut diag = self.dcx().struct_err("lifetimes cannot start with a number");
251255
diag.set_span(span);
252256
diag.stash(span, StashKey::LifetimeIsChar);
253257
}
@@ -308,7 +312,7 @@ impl<'a> StringReader<'a> {
308312
// fancier error recovery to it, as there will be less overall work to do this
309313
// way.
310314
let (token, sugg) = unicode_chars::check_for_substitution(self, start, c, repeats+1);
311-
self.sess.emit_err(errors::UnknownTokenStart {
315+
self.dcx().emit_err(errors::UnknownTokenStart {
312316
span: self.mk_sp(start, self.pos + Pos::from_usize(repeats * c.len_utf8())),
313317
escaped: escaped_char(c),
314318
sugg,
@@ -384,7 +388,7 @@ impl<'a> StringReader<'a> {
384388
content_start + BytePos(idx as u32 + 1),
385389
);
386390
let block = matches!(comment_kind, CommentKind::Block);
387-
self.sess.emit_err(errors::CrDocComment { span, block });
391+
self.dcx().emit_err(errors::CrDocComment { span, block });
388392
}
389393
}
390394

@@ -483,7 +487,7 @@ impl<'a> StringReader<'a> {
483487
rustc_lexer::LiteralKind::Int { base, empty_int } => {
484488
if empty_int {
485489
let span = self.mk_sp(start, end);
486-
self.sess.emit_err(errors::NoDigitsLiteral { span });
490+
self.dcx().emit_err(errors::NoDigitsLiteral { span });
487491
(token::Integer, sym::integer(0))
488492
} else {
489493
if matches!(base, Base::Binary | Base::Octal) {
@@ -495,7 +499,7 @@ impl<'a> StringReader<'a> {
495499
start + BytePos::from_usize(2 + idx + c.len_utf8()),
496500
);
497501
if c != '_' && c.to_digit(base).is_none() {
498-
self.sess.emit_err(errors::InvalidDigitLiteral { span, base });
502+
self.dcx().emit_err(errors::InvalidDigitLiteral { span, base });
499503
}
500504
}
501505
}
@@ -505,7 +509,7 @@ impl<'a> StringReader<'a> {
505509
rustc_lexer::LiteralKind::Float { base, empty_exponent } => {
506510
if empty_exponent {
507511
let span = self.mk_sp(start, self.pos);
508-
self.sess.emit_err(errors::EmptyExponentFloat { span });
512+
self.dcx().emit_err(errors::EmptyExponentFloat { span });
509513
}
510514
let base = match base {
511515
Base::Hexadecimal => Some("hexadecimal"),
@@ -515,7 +519,7 @@ impl<'a> StringReader<'a> {
515519
};
516520
if let Some(base) = base {
517521
let span = self.mk_sp(start, end);
518-
self.sess.emit_err(errors::FloatLiteralUnsupportedBase { span, base });
522+
self.dcx().emit_err(errors::FloatLiteralUnsupportedBase { span, base });
519523
}
520524
(token::Float, self.symbol_from_to(start, end))
521525
}
@@ -678,7 +682,7 @@ impl<'a> StringReader<'a> {
678682
} else {
679683
None
680684
};
681-
self.sess.emit_err(errors::UnknownPrefix { span: prefix_span, prefix, sugg });
685+
self.dcx().emit_err(errors::UnknownPrefix { span: prefix_span, prefix, sugg });
682686
} else {
683687
// Before Rust 2021, only emit a lint for migration.
684688
self.sess.buffer_lint_with_diagnostic(
@@ -692,7 +696,7 @@ impl<'a> StringReader<'a> {
692696
}
693697

694698
fn report_too_many_hashes(&self, start: BytePos, num: u32) -> ! {
695-
self.sess.emit_fatal(errors::TooManyHashes { span: self.mk_sp(start, self.pos), num });
699+
self.dcx().emit_fatal(errors::TooManyHashes { span: self.mk_sp(start, self.pos), num });
696700
}
697701

698702
fn cook_common(

‎compiler/rustc_parse/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,5 +263,5 @@ const CFG_ATTR_NOTE_REF: &str = "for more information, visit \
263263
#the-cfg_attr-attribute>";
264264

265265
fn error_malformed_cfg_attr_missing(span: Span, parse_sess: &ParseSess) {
266-
parse_sess.emit_err(errors::MalformedCfgAttr { span, sugg: CFG_ATTR_GRAMMAR_HELP });
266+
parse_sess.dcx.emit_err(errors::MalformedCfgAttr { span, sugg: CFG_ATTR_GRAMMAR_HELP });
267267
}

‎compiler/rustc_parse/src/parser/attr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ impl<'a> Parser<'a> {
323323
debug!("checking if {:?} is unsuffixed", lit);
324324

325325
if !lit.kind.is_unsuffixed() {
326-
self.sess.emit_err(SuffixedLiteralInAttribute { span: lit.span });
326+
self.dcx().emit_err(SuffixedLiteralInAttribute { span: lit.span });
327327
}
328328

329329
Ok(lit)

0 commit comments

Comments
 (0)