Skip to content

Commit c91edc3

Browse files
oli-obkoli-obk
committed
Prefer dcx methods over fields or fields' methods
1 parent 7e58930 commit c91edc3

File tree

24 files changed

+62
-58
lines changed

24 files changed

+62
-58
lines changed

‎compiler/rustc_attr/src/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ pub fn eval_condition(
596596
features: Option<&Features>,
597597
eval: &mut impl FnMut(Condition) -> bool,
598598
) -> bool {
599-
let dcx = &sess.psess.dcx;
599+
let dcx = sess.dcx();
600600
match &cfg.kind {
601601
ast::MetaItemKind::List(mis) if cfg.name_or_empty() == sym::version => {
602602
try_gate_cfg(sym::version, cfg.span, sess, features);

‎compiler/rustc_builtin_macros/src/asm.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pub fn parse_asm_args<'a>(
4646
sp: Span,
4747
is_global_asm: bool,
4848
) -> PResult<'a, AsmArgs> {
49-
let dcx = &p.psess.dcx;
49+
let dcx = p.dcx();
5050

5151
if p.token == token::Eof {
5252
return Err(dcx.create_err(errors::AsmRequiresTemplate { span: sp }));
@@ -307,7 +307,7 @@ pub fn parse_asm_args<'a>(
307307
fn err_duplicate_option(p: &Parser<'_>, symbol: Symbol, span: Span) {
308308
// Tool-only output
309309
let full_span = if p.token.kind == token::Comma { span.to(p.token.span) } else { span };
310-
p.psess.dcx.emit_err(errors::AsmOptAlreadyprovided { span, symbol, full_span });
310+
p.dcx().emit_err(errors::AsmOptAlreadyprovided { span, symbol, full_span });
311311
}
312312

313313
/// Try to set the provided option in the provided `AsmArgs`.
@@ -379,7 +379,7 @@ fn parse_clobber_abi<'a>(p: &mut Parser<'a>, args: &mut AsmArgs) -> PResult<'a,
379379
p.expect(&token::OpenDelim(Delimiter::Parenthesis))?;
380380

381381
if p.eat(&token::CloseDelim(Delimiter::Parenthesis)) {
382-
return Err(p.psess.dcx.create_err(errors::NonABI { span: p.token.span }));
382+
return Err(p.dcx().create_err(errors::NonABI { span: p.token.span }));
383383
}
384384

385385
let mut new_abis = Vec::new();
@@ -390,7 +390,7 @@ fn parse_clobber_abi<'a>(p: &mut Parser<'a>, args: &mut AsmArgs) -> PResult<'a,
390390
}
391391
Err(opt_lit) => {
392392
let span = opt_lit.map_or(p.token.span, |lit| lit.span);
393-
let mut err = p.psess.dcx.struct_span_err(span, "expected string literal");
393+
let mut err = p.dcx().struct_span_err(span, "expected string literal");
394394
err.span_label(span, "not a string literal");
395395
return Err(err);
396396
}

‎compiler/rustc_builtin_macros/src/cmdline_attrs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub fn inject(krate: &mut ast::Crate, psess: &ParseSess, attrs: &[String]) {
2626
};
2727
let end_span = parser.token.span;
2828
if parser.token != token::Eof {
29-
psess.dcx.emit_err(errors::InvalidCrateAttr { span: start_span.to(end_span) });
29+
psess.dcx().emit_err(errors::InvalidCrateAttr { span: start_span.to(end_span) });
3030
continue;
3131
}
3232

‎compiler/rustc_expand/src/base.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1358,7 +1358,7 @@ fn pretty_printing_compatibility_hack(item: &Item, sess: &Session) {
13581358
if crate_matches {
13591359
// FIXME: make this translatable
13601360
#[allow(rustc::untranslatable_diagnostic)]
1361-
sess.psess.dcx.emit_fatal(errors::ProcMacroBackCompat {
1361+
sess.dcx().emit_fatal(errors::ProcMacroBackCompat {
13621362
crate_name: "rental".to_string(),
13631363
fixed_version: "0.5.6".to_string(),
13641364
});

‎compiler/rustc_expand/src/mbe/macro_check.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ pub(super) fn check_meta_variables(
206206
rhses: &[TokenTree],
207207
) -> Result<(), ErrorGuaranteed> {
208208
if lhses.len() != rhses.len() {
209-
psess.dcx.span_bug(span, "length mismatch between LHSes and RHSes")
209+
psess.dcx().span_bug(span, "length mismatch between LHSes and RHSes")
210210
}
211211
let mut guar = None;
212212
for (lhs, rhs) in iter::zip(lhses, rhses) {
@@ -245,7 +245,7 @@ fn check_binders(
245245
// MetaVar(fragment) and not as MetaVarDecl(y, fragment).
246246
TokenTree::MetaVar(span, name) => {
247247
if macros.is_empty() {
248-
psess.dcx.span_bug(span, "unexpected MetaVar in lhs");
248+
psess.dcx().span_bug(span, "unexpected MetaVar in lhs");
249249
}
250250
let name = MacroRulesNormalizedIdent::new(name);
251251
// There are 3 possibilities:
@@ -276,15 +276,15 @@ fn check_binders(
276276
);
277277
}
278278
if !macros.is_empty() {
279-
psess.dcx.span_bug(span, "unexpected MetaVarDecl in nested lhs");
279+
psess.dcx().span_bug(span, "unexpected MetaVarDecl in nested lhs");
280280
}
281281
let name = MacroRulesNormalizedIdent::new(name);
282282
if let Some(prev_info) = get_binder_info(macros, binders, name) {
283283
// Duplicate binders at the top-level macro definition are errors. The lint is only
284284
// for nested macro definitions.
285285
*guar = Some(
286286
psess
287-
.dcx
287+
.dcx()
288288
.emit_err(errors::DuplicateMatcherBinding { span, prev: prev_info.span }),
289289
);
290290
} else {
@@ -344,7 +344,7 @@ fn check_occurrences(
344344
match *rhs {
345345
TokenTree::Token(..) => {}
346346
TokenTree::MetaVarDecl(span, _name, _kind) => {
347-
psess.dcx.span_bug(span, "unexpected MetaVarDecl in rhs")
347+
psess.dcx().span_bug(span, "unexpected MetaVarDecl in rhs")
348348
}
349349
TokenTree::MetaVar(span, name) => {
350350
let name = MacroRulesNormalizedIdent::new(name);

‎compiler/rustc_expand/src/mbe/macro_rules.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ pub fn compile_declarative_macro(
383383
};
384384
let dummy_syn_ext = |guar| (mk_syn_ext(Box::new(DummyExpander(guar))), Vec::new());
385385

386-
let dcx = &sess.psess.dcx;
386+
let dcx = sess.dcx();
387387
let lhs_nm = Ident::new(sym::lhs, def.span);
388388
let rhs_nm = Ident::new(sym::rhs, def.span);
389389
let tt_spec = Some(NonterminalKind::TT);

‎compiler/rustc_expand/src/mbe/metavar_expr.rs

+15-14
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ impl MetaVarExpr {
4242
let ident = parse_ident(&mut tts, psess, outer_span)?;
4343
let Some(TokenTree::Delimited(.., Delimiter::Parenthesis, args)) = tts.next() else {
4444
let msg = "meta-variable expression parameter must be wrapped in parentheses";
45-
return Err(psess.dcx.struct_span_err(ident.span, msg));
45+
return Err(psess.dcx().struct_span_err(ident.span, msg));
4646
};
4747
check_trailing_token(&mut tts, psess)?;
4848
let mut iter = args.trees();
@@ -62,12 +62,12 @@ impl MetaVarExpr {
6262
break;
6363
}
6464
if !try_eat_comma(&mut iter) {
65-
return Err(psess.dcx.struct_span_err(outer_span, "expected comma"));
65+
return Err(psess.dcx().struct_span_err(outer_span, "expected comma"));
6666
}
6767
}
6868
if result.len() < 2 {
6969
return Err(psess
70-
.dcx
70+
.dcx()
7171
.struct_span_err(ident.span, "`concat` must have at least two elements"));
7272
}
7373
MetaVarExpr::Concat(result.into())
@@ -81,7 +81,7 @@ impl MetaVarExpr {
8181
"len" => MetaVarExpr::Len(parse_depth(&mut iter, psess, ident.span)?),
8282
_ => {
8383
let err_msg = "unrecognized meta-variable expression";
84-
let mut err = psess.dcx.struct_span_err(ident.span, err_msg);
84+
let mut err = psess.dcx().struct_span_err(ident.span, err_msg);
8585
err.span_suggestion(
8686
ident.span,
8787
"supported expressions are count, ignore, index and len",
@@ -120,7 +120,7 @@ fn check_trailing_token<'psess>(
120120
) -> PResult<'psess, ()> {
121121
if let Some(tt) = iter.next() {
122122
let mut diag = psess
123-
.dcx
123+
.dcx()
124124
.struct_span_err(tt.span(), format!("unexpected token: {}", pprust::tt_to_string(tt)));
125125
diag.span_note(tt.span(), "meta-variable expression must not have trailing tokens");
126126
Err(diag)
@@ -139,7 +139,7 @@ fn parse_count<'psess>(
139139
let ident = parse_ident(iter, psess, span)?;
140140
let depth = if try_eat_comma(iter) {
141141
if iter.look_ahead(0).is_none() {
142-
return Err(psess.dcx.struct_span_err(
142+
return Err(psess.dcx().struct_span_err(
143143
span,
144144
"`count` followed by a comma must have an associated index indicating its depth",
145145
));
@@ -160,7 +160,7 @@ fn parse_depth<'psess>(
160160
let Some(tt) = iter.next() else { return Ok(0) };
161161
let TokenTree::Token(token::Token { kind: token::TokenKind::Literal(lit), .. }, _) = tt else {
162162
return Err(psess
163-
.dcx
163+
.dcx()
164164
.struct_span_err(span, "meta-variable expression depth must be a literal"));
165165
};
166166
if let Ok(lit_kind) = LitKind::from_token_lit(*lit)
@@ -170,7 +170,7 @@ fn parse_depth<'psess>(
170170
Ok(n_usize)
171171
} else {
172172
let msg = "only unsuffixes integer literals are supported in meta-variable expressions";
173-
Err(psess.dcx.struct_span_err(span, msg))
173+
Err(psess.dcx().struct_span_err(span, msg))
174174
}
175175
}
176176

@@ -181,20 +181,21 @@ fn parse_ident<'psess>(
181181
fallback_span: Span,
182182
) -> PResult<'psess, Ident> {
183183
let Some(tt) = iter.next() else {
184-
return Err(psess.dcx.struct_span_err(fallback_span, "expected identifier"));
184+
return Err(psess.dcx().struct_span_err(fallback_span, "expected identifier"));
185185
};
186186
let TokenTree::Token(token, _) = tt else {
187-
return Err(psess.dcx.struct_span_err(tt.span(), "expected identifier"));
187+
return Err(psess.dcx().struct_span_err(tt.span(), "expected identifier"));
188188
};
189189
if let Some((elem, is_raw)) = token.ident() {
190190
if let IdentIsRaw::Yes = is_raw {
191-
return Err(psess.dcx.struct_span_err(elem.span, RAW_IDENT_ERR));
191+
return Err(psess.dcx().struct_span_err(elem.span, RAW_IDENT_ERR));
192192
}
193193
return Ok(elem);
194194
}
195195
let token_str = pprust::token_to_string(token);
196-
let mut err =
197-
psess.dcx.struct_span_err(token.span, format!("expected identifier, found `{token_str}`"));
196+
let mut err = psess
197+
.dcx()
198+
.struct_span_err(token.span, format!("expected identifier, found `{token_str}`"));
198199
err.span_suggestion(
199200
token.span,
200201
format!("try removing `{token_str}`"),
@@ -236,7 +237,7 @@ fn eat_dollar<'psess>(
236237
let _ = iter.next();
237238
return Ok(());
238239
}
239-
Err(psess.dcx.struct_span_err(
240+
Err(psess.dcx().struct_span_err(
240241
span,
241242
"meta-variables within meta-variable expressions must be referenced using a dollar sign",
242243
))

‎compiler/rustc_expand/src/mbe/transcribe.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ pub(super) fn transcribe<'a>(
141141
let mut result_stack = Vec::new();
142142
let mut marker = Marker(expand_id, transparency, Default::default());
143143

144-
let dcx = &psess.dcx;
144+
let dcx = psess.dcx();
145145
loop {
146146
// Look at the last frame on the stack.
147147
// If it still has a TokenTree we have not looked at yet, use that tree.

‎compiler/rustc_expand/src/proc_macro_server.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ impl server::FreeFunctions for Rustc<'_, '_> {
522522
fn emit_diagnostic(&mut self, diagnostic: Diagnostic<Self::Span>) {
523523
let message = rustc_errors::DiagMessage::from(diagnostic.message);
524524
let mut diag: Diag<'_, ()> =
525-
Diag::new(&self.psess().dcx, diagnostic.level.to_internal(), message);
525+
Diag::new(self.psess().dcx(), diagnostic.level.to_internal(), message);
526526
diag.span(MultiSpan::from_spans(diagnostic.spans));
527527
for child in diagnostic.children {
528528
// This message comes from another diagnostic, and we are just reconstructing the

‎compiler/rustc_hir_analysis/src/check/errs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fn handle_static_mut_ref(
6363
} else {
6464
(errors::StaticMutRefSugg::Shared { span, var }, "shared")
6565
};
66-
tcx.sess.psess.dcx.emit_err(errors::StaticMutRef { span, sugg, shared });
66+
tcx.dcx().emit_err(errors::StaticMutRef { span, sugg, shared });
6767
} else {
6868
let (sugg, shared) = if mutable == Mutability::Mut {
6969
(errors::RefOfMutStaticSugg::Mut { span, var }, "mutable")

‎compiler/rustc_hir_typeck/src/fn_ctxt/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
146146
}
147147

148148
pub(crate) fn dcx(&self) -> &'tcx DiagCtxt {
149-
self.tcx.dcx()
149+
self.infcx.dcx()
150150
}
151151

152152
pub fn cause(&self, span: Span, code: ObligationCauseCode<'tcx>) -> ObligationCause<'tcx> {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ pub struct TypeErrCtxt<'a, 'tcx> {
140140

141141
impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
142142
pub fn dcx(&self) -> &'tcx DiagCtxt {
143-
self.infcx.tcx.dcx()
143+
self.infcx.dcx()
144144
}
145145

146146
/// This is just to avoid a potential footgun of accidentally

‎compiler/rustc_metadata/src/creader.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ impl<'a, 'tcx> std::ops::Deref for CrateLoader<'a, 'tcx> {
9292

9393
impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
9494
fn dcx(&self) -> &'tcx DiagCtxt {
95-
&self.tcx.dcx()
95+
self.tcx.dcx()
9696
}
9797
}
9898

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

+4-5
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ struct StringReader<'psess, 'src> {
114114

115115
impl<'psess, 'src> StringReader<'psess, 'src> {
116116
fn dcx(&self) -> &'psess DiagCtxt {
117-
&self.psess.dcx
117+
self.psess.dcx()
118118
}
119119

120120
fn mk_sp(&self, lo: BytePos, hi: BytePos) -> Span {
@@ -248,8 +248,8 @@ impl<'psess, 'src> StringReader<'psess, 'src> {
248248
let suffix = if suffix_start < self.pos {
249249
let string = self.str_from(suffix_start);
250250
if string == "_" {
251-
self.psess
252-
.dcx
251+
self
252+
.dcx()
253253
.emit_err(errors::UnderscoreLiteralSuffix { span: self.mk_sp(suffix_start, self.pos) });
254254
None
255255
} else {
@@ -597,8 +597,7 @@ impl<'psess, 'src> StringReader<'psess, 'src> {
597597
}
598598

599599
fn report_non_started_raw_string(&self, start: BytePos, bad_char: char) -> ! {
600-
self.psess
601-
.dcx
600+
self.dcx()
602601
.struct_span_fatal(
603602
self.mk_sp(start, self.pos),
604603
format!(

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ impl<'psess, 'src> TokenTreesReader<'psess, 'src> {
7171

7272
fn eof_err(&mut self) -> PErr<'psess> {
7373
let msg = "this file contains an unclosed delimiter";
74-
let mut err = self.string_reader.psess.dcx.struct_span_err(self.token.span, msg);
74+
let mut err = self.string_reader.dcx().struct_span_err(self.token.span, msg);
7575
for &(_, sp) in &self.diag_info.open_braces {
7676
err.span_label(sp, "unclosed delimiter");
7777
self.diag_info.unmatched_delims.push(UnmatchedDelim {
@@ -290,7 +290,7 @@ impl<'psess, 'src> TokenTreesReader<'psess, 'src> {
290290
// An unexpected closing delimiter (i.e., there is no matching opening delimiter).
291291
let token_str = token_to_string(&self.token);
292292
let msg = format!("unexpected closing delimiter: `{token_str}`");
293-
let mut err = self.string_reader.psess.dcx.struct_span_err(self.token.span, msg);
293+
let mut err = self.string_reader.dcx().struct_span_err(self.token.span, msg);
294294

295295
report_suspicious_mismatch_block(
296296
&mut err,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ pub(super) fn check_for_substitution(
351351

352352
let Some((_, ascii_name, token)) = ASCII_ARRAY.iter().find(|&&(s, _, _)| s == ascii_str) else {
353353
let msg = format!("substitution character not found for '{ch}'");
354-
reader.psess.dcx.span_bug(span, msg);
354+
reader.dcx().span_bug(span, msg);
355355
};
356356

357357
// special help suggestion for "directed" double quotes

‎compiler/rustc_parse/src/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ pub fn new_parser_from_file<'a>(
7373
) -> Result<Parser<'a>, Vec<Diag<'a>>> {
7474
let source_file = psess.source_map().load_file(path).unwrap_or_else(|e| {
7575
let msg = format!("couldn't read {}: {}", path.display(), e);
76-
let mut err = psess.dcx.struct_fatal(msg);
76+
let mut err = psess.dcx().struct_fatal(msg);
7777
if let Some(sp) = sp {
7878
err.span(sp);
7979
}
@@ -115,7 +115,7 @@ fn source_file_to_stream<'psess>(
115115
override_span: Option<Span>,
116116
) -> Result<TokenStream, Vec<Diag<'psess>>> {
117117
let src = source_file.src.as_ref().unwrap_or_else(|| {
118-
psess.dcx.bug(format!(
118+
psess.dcx().bug(format!(
119119
"cannot lex `source_file` without source: {}",
120120
psess.source_map().filename_for_diagnostics(&source_file.name)
121121
));
@@ -179,7 +179,7 @@ pub fn parse_cfg_attr(
179179
}
180180
}
181181
_ => {
182-
psess.dcx.emit_err(errors::MalformedCfgAttr {
182+
psess.dcx().emit_err(errors::MalformedCfgAttr {
183183
span: attr.span,
184184
sugg: CFG_ATTR_GRAMMAR_HELP,
185185
});

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl AttrWrapper {
4141
}
4242

4343
pub(crate) fn take_for_recovery(self, psess: &ParseSess) -> AttrVec {
44-
psess.dcx.span_delayed_bug(
44+
psess.dcx().span_delayed_bug(
4545
self.attrs.get(0).map(|attr| attr.span).unwrap_or(DUMMY_SP),
4646
"AttrVec is taken for recovery but no error is produced",
4747
);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ impl<'a> DerefMut for SnapshotParser<'a> {
241241

242242
impl<'a> Parser<'a> {
243243
pub fn dcx(&self) -> &'a DiagCtxt {
244-
&self.psess.dcx
244+
self.psess.dcx()
245245
}
246246

247247
/// Replace `self` with `snapshot.parser`.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1596,7 +1596,7 @@ pub(crate) fn make_unclosed_delims_error(
15961596
if let Some(sp) = unmatched.unclosed_span {
15971597
spans.push(sp);
15981598
};
1599-
let err = psess.dcx.create_err(MismatchedClosingDelimiter {
1599+
let err = psess.dcx().create_err(MismatchedClosingDelimiter {
16001600
spans,
16011601
delimiter: pprust::token_kind_to_string(&token::CloseDelim(found_delim)).to_string(),
16021602
unmatched: unmatched.found_span,

0 commit comments

Comments
 (0)