Skip to content

Commit 7f97aea

Browse files
borsbors
committed
Auto merge of #107679 - est31:less_import_overhead, r=compiler-errors
Less import overhead for errors This removes huge (3+ lines) import lists found in files that had their error reporting migrated. These lists are bad for developer workflows as adding, removing, or editing a single error's name might cause a chain reaction that bloats the git diff. As the error struct names are long, the likelihood of such chain reactions is high. Follows the suggestion by `@Nilstrieb` in the [zulip thread](https://rust-lang.zulipchat.com/#narrow/stream/147480-t-compiler.2Fwg-diagnostics/topic/massive.20use.20statements) to replace the `use errors::{FooErr, BarErr};` with `use errors;` and then changing to `errors::FooErr` on the usage sites. I have used sed to do most of the changes, i.e. something like: ``` sed -i -E 's/(create_err|create_feature_err|emit_err|create_note|emit_fatal|emit_warning)\(([[:alnum:]]+|[A-Z][[:alnum:]:]*)( \{|\))/\1(errors::\2\3/' path/to/file.rs ``` & then I manually fixed the errors that occured. Most manual changes were required in `compiler/rustc_parse/src/parser/expr.rs`. r? `@compiler-errors`
2 parents 2a6ff72 + 580cc89 commit 7f97aea

File tree

11 files changed

+356
-376
lines changed

11 files changed

+356
-376
lines changed

‎compiler/rustc_const_eval/src/transform/check_consts/ops.rs

+35-37
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,7 @@ use rustc_span::{BytePos, Pos, Span, Symbol};
2222
use rustc_trait_selection::traits::SelectionContext;
2323

2424
use super::ConstCx;
25-
use crate::errors::{
26-
InteriorMutabilityBorrow, InteriorMutableDataRefer, MutDerefErr, NonConstFmtMacroCall,
27-
NonConstFnCall, NonConstOpErr, PanicNonStrErr, RawPtrToIntErr, StaticAccessErr,
28-
TransientMutBorrowErr, TransientMutBorrowErrRaw, UnallowedFnPointerCall,
29-
UnallowedHeapAllocations, UnallowedInlineAsm, UnallowedMutableRefs, UnallowedMutableRefsRaw,
30-
UnallowedOpInConstContext, UnstableConstFn,
31-
};
25+
use crate::errors;
3226
use crate::util::{call_kind, CallDesugaringKind, CallKind};
3327

3428
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -99,7 +93,7 @@ impl<'tcx> NonConstOp<'tcx> for FnCallIndirect {
9993
ccx: &ConstCx<'_, 'tcx>,
10094
span: Span,
10195
) -> DiagnosticBuilder<'tcx, ErrorGuaranteed> {
102-
ccx.tcx.sess.create_err(UnallowedFnPointerCall { span, kind: ccx.const_kind() })
96+
ccx.tcx.sess.create_err(errors::UnallowedFnPointerCall { span, kind: ccx.const_kind() })
10397
}
10498
}
10599

@@ -303,10 +297,11 @@ impl<'tcx> NonConstOp<'tcx> for FnCallNonConst<'tcx> {
303297
diag_trait(&mut err, self_ty, tcx.require_lang_item(LangItem::Deref, Some(span)));
304298
err
305299
}
306-
_ if tcx.opt_parent(callee) == tcx.get_diagnostic_item(sym::ArgumentV1Methods) => {
307-
ccx.tcx.sess.create_err(NonConstFmtMacroCall { span, kind: ccx.const_kind() })
308-
}
309-
_ => ccx.tcx.sess.create_err(NonConstFnCall {
300+
_ if tcx.opt_parent(callee) == tcx.get_diagnostic_item(sym::ArgumentV1Methods) => ccx
301+
.tcx
302+
.sess
303+
.create_err(errors::NonConstFmtMacroCall { span, kind: ccx.const_kind() }),
304+
_ => ccx.tcx.sess.create_err(errors::NonConstFnCall {
310305
span,
311306
def_path_str: ccx.tcx.def_path_str_with_substs(callee, substs),
312307
kind: ccx.const_kind(),
@@ -351,7 +346,7 @@ impl<'tcx> NonConstOp<'tcx> for FnCallUnstable {
351346
let mut err = ccx
352347
.tcx
353348
.sess
354-
.create_err(UnstableConstFn { span, def_path: ccx.tcx.def_path_str(def_id) });
349+
.create_err(errors::UnstableConstFn { span, def_path: ccx.tcx.def_path_str(def_id) });
355350

356351
if ccx.is_const_stable_const_fn() {
357352
err.help("const-stable functions can only call other const-stable functions");
@@ -387,11 +382,11 @@ impl<'tcx> NonConstOp<'tcx> for Generator {
387382
let msg = format!("{}s are not allowed in {}s", self.0.descr(), ccx.const_kind());
388383
if let hir::GeneratorKind::Async(hir::AsyncGeneratorKind::Block) = self.0 {
389384
ccx.tcx.sess.create_feature_err(
390-
UnallowedOpInConstContext { span, msg },
385+
errors::UnallowedOpInConstContext { span, msg },
391386
sym::const_async_blocks,
392387
)
393388
} else {
394-
ccx.tcx.sess.create_err(UnallowedOpInConstContext { span, msg })
389+
ccx.tcx.sess.create_err(errors::UnallowedOpInConstContext { span, msg })
395390
}
396391
}
397392
}
@@ -404,7 +399,7 @@ impl<'tcx> NonConstOp<'tcx> for HeapAllocation {
404399
ccx: &ConstCx<'_, 'tcx>,
405400
span: Span,
406401
) -> DiagnosticBuilder<'tcx, ErrorGuaranteed> {
407-
ccx.tcx.sess.create_err(UnallowedHeapAllocations {
402+
ccx.tcx.sess.create_err(errors::UnallowedHeapAllocations {
408403
span,
409404
kind: ccx.const_kind(),
410405
teach: ccx.tcx.sess.teach(&error_code!(E0010)).then_some(()),
@@ -420,7 +415,7 @@ impl<'tcx> NonConstOp<'tcx> for InlineAsm {
420415
ccx: &ConstCx<'_, 'tcx>,
421416
span: Span,
422417
) -> DiagnosticBuilder<'tcx, ErrorGuaranteed> {
423-
ccx.tcx.sess.create_err(UnallowedInlineAsm { span, kind: ccx.const_kind() })
418+
ccx.tcx.sess.create_err(errors::UnallowedInlineAsm { span, kind: ccx.const_kind() })
424419
}
425420
}
426421

@@ -471,7 +466,9 @@ impl<'tcx> NonConstOp<'tcx> for TransientCellBorrow {
471466
ccx: &ConstCx<'_, 'tcx>,
472467
span: Span,
473468
) -> DiagnosticBuilder<'tcx, ErrorGuaranteed> {
474-
ccx.tcx.sess.create_feature_err(InteriorMutabilityBorrow { span }, sym::const_refs_to_cell)
469+
ccx.tcx
470+
.sess
471+
.create_feature_err(errors::InteriorMutabilityBorrow { span }, sym::const_refs_to_cell)
475472
}
476473
}
477474

@@ -488,14 +485,14 @@ impl<'tcx> NonConstOp<'tcx> for CellBorrow {
488485
) -> DiagnosticBuilder<'tcx, ErrorGuaranteed> {
489486
// FIXME: Maybe a more elegant solution to this if else case
490487
if let hir::ConstContext::Static(_) = ccx.const_kind() {
491-
ccx.tcx.sess.create_err(InteriorMutableDataRefer {
488+
ccx.tcx.sess.create_err(errors::InteriorMutableDataRefer {
492489
span,
493490
opt_help: Some(()),
494491
kind: ccx.const_kind(),
495492
teach: ccx.tcx.sess.teach(&error_code!(E0492)).then_some(()),
496493
})
497494
} else {
498-
ccx.tcx.sess.create_err(InteriorMutableDataRefer {
495+
ccx.tcx.sess.create_err(errors::InteriorMutableDataRefer {
499496
span,
500497
opt_help: None,
501498
kind: ccx.const_kind(),
@@ -528,12 +525,12 @@ impl<'tcx> NonConstOp<'tcx> for MutBorrow {
528525
span: Span,
529526
) -> DiagnosticBuilder<'tcx, ErrorGuaranteed> {
530527
match self.0 {
531-
hir::BorrowKind::Raw => ccx.tcx.sess.create_err(UnallowedMutableRefsRaw {
528+
hir::BorrowKind::Raw => ccx.tcx.sess.create_err(errors::UnallowedMutableRefsRaw {
532529
span,
533530
kind: ccx.const_kind(),
534531
teach: ccx.tcx.sess.teach(&error_code!(E0764)).then_some(()),
535532
}),
536-
hir::BorrowKind::Ref => ccx.tcx.sess.create_err(UnallowedMutableRefs {
533+
hir::BorrowKind::Ref => ccx.tcx.sess.create_err(errors::UnallowedMutableRefs {
537534
span,
538535
kind: ccx.const_kind(),
539536
teach: ccx.tcx.sess.teach(&error_code!(E0764)).then_some(()),
@@ -557,14 +554,14 @@ impl<'tcx> NonConstOp<'tcx> for TransientMutBorrow {
557554
) -> DiagnosticBuilder<'tcx, ErrorGuaranteed> {
558555
let kind = ccx.const_kind();
559556
match self.0 {
560-
hir::BorrowKind::Raw => ccx
561-
.tcx
562-
.sess
563-
.create_feature_err(TransientMutBorrowErrRaw { span, kind }, sym::const_mut_refs),
564-
hir::BorrowKind::Ref => ccx
565-
.tcx
566-
.sess
567-
.create_feature_err(TransientMutBorrowErr { span, kind }, sym::const_mut_refs),
557+
hir::BorrowKind::Raw => ccx.tcx.sess.create_feature_err(
558+
errors::TransientMutBorrowErrRaw { span, kind },
559+
sym::const_mut_refs,
560+
),
561+
hir::BorrowKind::Ref => ccx.tcx.sess.create_feature_err(
562+
errors::TransientMutBorrowErr { span, kind },
563+
sym::const_mut_refs,
564+
),
568565
}
569566
}
570567
}
@@ -586,9 +583,10 @@ impl<'tcx> NonConstOp<'tcx> for MutDeref {
586583
ccx: &ConstCx<'_, 'tcx>,
587584
span: Span,
588585
) -> DiagnosticBuilder<'tcx, ErrorGuaranteed> {
589-
ccx.tcx
590-
.sess
591-
.create_feature_err(MutDerefErr { span, kind: ccx.const_kind() }, sym::const_mut_refs)
586+
ccx.tcx.sess.create_feature_err(
587+
errors::MutDerefErr { span, kind: ccx.const_kind() },
588+
sym::const_mut_refs,
589+
)
592590
}
593591
}
594592

@@ -601,7 +599,7 @@ impl<'tcx> NonConstOp<'tcx> for PanicNonStr {
601599
ccx: &ConstCx<'_, 'tcx>,
602600
span: Span,
603601
) -> DiagnosticBuilder<'tcx, ErrorGuaranteed> {
604-
ccx.tcx.sess.create_err(PanicNonStrErr { span })
602+
ccx.tcx.sess.create_err(errors::PanicNonStrErr { span })
605603
}
606604
}
607605

@@ -652,7 +650,7 @@ impl<'tcx> NonConstOp<'tcx> for RawPtrToIntCast {
652650
ccx: &ConstCx<'_, 'tcx>,
653651
span: Span,
654652
) -> DiagnosticBuilder<'tcx, ErrorGuaranteed> {
655-
ccx.tcx.sess.create_err(RawPtrToIntErr { span })
653+
ccx.tcx.sess.create_err(errors::RawPtrToIntErr { span })
656654
}
657655
}
658656

@@ -673,7 +671,7 @@ impl<'tcx> NonConstOp<'tcx> for StaticAccess {
673671
ccx: &ConstCx<'_, 'tcx>,
674672
span: Span,
675673
) -> DiagnosticBuilder<'tcx, ErrorGuaranteed> {
676-
ccx.tcx.sess.create_err(StaticAccessErr {
674+
ccx.tcx.sess.create_err(errors::StaticAccessErr {
677675
span,
678676
kind: ccx.const_kind(),
679677
teach: ccx.tcx.sess.teach(&error_code!(E0013)).then_some(()),
@@ -690,7 +688,7 @@ impl<'tcx> NonConstOp<'tcx> for ThreadLocalAccess {
690688
ccx: &ConstCx<'_, 'tcx>,
691689
span: Span,
692690
) -> DiagnosticBuilder<'tcx, ErrorGuaranteed> {
693-
ccx.tcx.sess.create_err(NonConstOpErr { span })
691+
ccx.tcx.sess.create_err(errors::NonConstOpErr { span })
694692
}
695693
}
696694

‎compiler/rustc_expand/src/base.rs

+25-23
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
#![deny(rustc::untranslatable_diagnostic)]
22

3-
use crate::errors::{
4-
ArgumentNotAttributes, AttrNoArguments, AttributeMetaItem, AttributeSingleWord,
5-
AttributesWrongForm, CannotBeNameOfMacro, ExpectedCommaInList, HelperAttributeNameInvalid,
6-
MacroBodyStability, MacroConstStability, NotAMetaItem, OnlyOneArgument, OnlyOneWord,
7-
ResolveRelativePath, TakesNoArguments, TraceMacro,
8-
};
3+
use crate::errors;
94
use crate::expand::{self, AstFragment, Invocation};
105
use crate::module::DirOwnership;
116

@@ -796,13 +791,13 @@ impl SyntaxExtension {
796791
.unwrap_or_else(|| (None, helper_attrs));
797792
let (stability, const_stability, body_stability) = attr::find_stability(&sess, attrs, span);
798793
if let Some((_, sp)) = const_stability {
799-
sess.emit_err(MacroConstStability {
794+
sess.emit_err(errors::MacroConstStability {
800795
span: sp,
801796
head_span: sess.source_map().guess_head_span(span),
802797
});
803798
}
804799
if let Some((_, sp)) = body_stability {
805-
sess.emit_err(MacroBodyStability {
800+
sess.emit_err(errors::MacroBodyStability {
806801
span: sp,
807802
head_span: sess.source_map().guess_head_span(span),
808803
});
@@ -1143,7 +1138,7 @@ impl<'a> ExtCtxt<'a> {
11431138
}
11441139
pub fn trace_macros_diag(&mut self) {
11451140
for (span, notes) in self.expansions.iter() {
1146-
let mut db = self.sess.parse_sess.create_note(TraceMacro { span: *span });
1141+
let mut db = self.sess.parse_sess.create_note(errors::TraceMacro { span: *span });
11471142
for note in notes {
11481143
db.note(note);
11491144
}
@@ -1197,7 +1192,7 @@ pub fn resolve_path(
11971192
.expect("attempting to resolve a file path in an external file"),
11981193
FileName::DocTest(path, _) => path,
11991194
other => {
1200-
return Err(ResolveRelativePath {
1195+
return Err(errors::ResolveRelativePath {
12011196
span,
12021197
path: parse_sess.source_map().filename_for_diagnostics(&other).to_string(),
12031198
}
@@ -1279,7 +1274,7 @@ pub fn expr_to_string(
12791274
/// done as rarely as possible).
12801275
pub fn check_zero_tts(cx: &ExtCtxt<'_>, span: Span, tts: TokenStream, name: &str) {
12811276
if !tts.is_empty() {
1282-
cx.emit_err(TakesNoArguments { span, name });
1277+
cx.emit_err(errors::TakesNoArguments { span, name });
12831278
}
12841279
}
12851280

@@ -1307,14 +1302,14 @@ pub fn get_single_str_from_tts(
13071302
) -> Option<Symbol> {
13081303
let mut p = cx.new_parser_from_tts(tts);
13091304
if p.token == token::Eof {
1310-
cx.emit_err(OnlyOneArgument { span, name });
1305+
cx.emit_err(errors::OnlyOneArgument { span, name });
13111306
return None;
13121307
}
13131308
let ret = parse_expr(&mut p)?;
13141309
let _ = p.eat(&token::Comma);
13151310

13161311
if p.token != token::Eof {
1317-
cx.emit_err(OnlyOneArgument { span, name });
1312+
cx.emit_err(errors::OnlyOneArgument { span, name });
13181313
}
13191314
expr_to_string(cx, ret, "argument must be a string literal").map(|(s, _)| s)
13201315
}
@@ -1336,7 +1331,7 @@ pub fn get_exprs_from_tts(cx: &mut ExtCtxt<'_>, tts: TokenStream) -> Option<Vec<
13361331
continue;
13371332
}
13381333
if p.token != token::Eof {
1339-
cx.emit_err(ExpectedCommaInList { span: p.token.span });
1334+
cx.emit_err(errors::ExpectedCommaInList { span: p.token.span });
13401335
return None;
13411336
}
13421337
}
@@ -1353,51 +1348,58 @@ pub fn parse_macro_name_and_helper_attrs(
13531348
// `#[proc_macro_derive(Foo, attributes(A, ..))]`
13541349
let list = attr.meta_item_list()?;
13551350
if list.len() != 1 && list.len() != 2 {
1356-
diag.emit_err(AttrNoArguments { span: attr.span });
1351+
diag.emit_err(errors::AttrNoArguments { span: attr.span });
13571352
return None;
13581353
}
13591354
let Some(trait_attr) = list[0].meta_item() else {
1360-
diag.emit_err(NotAMetaItem {span: list[0].span()});
1355+
diag.emit_err(errors::NotAMetaItem {span: list[0].span()});
13611356
return None;
13621357
};
13631358
let trait_ident = match trait_attr.ident() {
13641359
Some(trait_ident) if trait_attr.is_word() => trait_ident,
13651360
_ => {
1366-
diag.emit_err(OnlyOneWord { span: trait_attr.span });
1361+
diag.emit_err(errors::OnlyOneWord { span: trait_attr.span });
13671362
return None;
13681363
}
13691364
};
13701365

13711366
if !trait_ident.name.can_be_raw() {
1372-
diag.emit_err(CannotBeNameOfMacro { span: trait_attr.span, trait_ident, macro_type });
1367+
diag.emit_err(errors::CannotBeNameOfMacro {
1368+
span: trait_attr.span,
1369+
trait_ident,
1370+
macro_type,
1371+
});
13731372
}
13741373

13751374
let attributes_attr = list.get(1);
13761375
let proc_attrs: Vec<_> = if let Some(attr) = attributes_attr {
13771376
if !attr.has_name(sym::attributes) {
1378-
diag.emit_err(ArgumentNotAttributes { span: attr.span() });
1377+
diag.emit_err(errors::ArgumentNotAttributes { span: attr.span() });
13791378
}
13801379
attr.meta_item_list()
13811380
.unwrap_or_else(|| {
1382-
diag.emit_err(AttributesWrongForm { span: attr.span() });
1381+
diag.emit_err(errors::AttributesWrongForm { span: attr.span() });
13831382
&[]
13841383
})
13851384
.iter()
13861385
.filter_map(|attr| {
13871386
let Some(attr) = attr.meta_item() else {
1388-
diag.emit_err(AttributeMetaItem { span: attr.span() });
1387+
diag.emit_err(errors::AttributeMetaItem { span: attr.span() });
13891388
return None;
13901389
};
13911390

13921391
let ident = match attr.ident() {
13931392
Some(ident) if attr.is_word() => ident,
13941393
_ => {
1395-
diag.emit_err(AttributeSingleWord { span: attr.span });
1394+
diag.emit_err(errors::AttributeSingleWord { span: attr.span });
13961395
return None;
13971396
}
13981397
};
13991398
if !ident.name.can_be_raw() {
1400-
diag.emit_err(HelperAttributeNameInvalid { span: attr.span, name: ident });
1399+
diag.emit_err(errors::HelperAttributeNameInvalid {
1400+
span: attr.span,
1401+
name: ident,
1402+
});
14011403
}
14021404

14031405
Some(ident.name)

0 commit comments

Comments
 (0)