Skip to content

Commit b299dfd

Browse files
nnethercotennethercote
committed
Rename BuiltinLintDiagnostics as BuiltinLintDiag.
Not the dropping of the trailing `s` -- this type describes a single diagnostic and its name should be singular.
1 parent 3cdd081 commit b299dfd

File tree

23 files changed

+105
-116
lines changed

23 files changed

+105
-116
lines changed

‎compiler/rustc_ast_passes/src/ast_validation.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use rustc_parse::validate_attr;
1818
use rustc_session::lint::builtin::{
1919
DEPRECATED_WHERE_CLAUSE_LOCATION, MISSING_ABI, PATTERNS_IN_FNS_WITHOUT_BODY,
2020
};
21-
use rustc_session::lint::{BuiltinLintDiagnostics, LintBuffer};
21+
use rustc_session::lint::{BuiltinLintDiag, LintBuffer};
2222
use rustc_session::Session;
2323
use rustc_span::symbol::{kw, sym, Ident};
2424
use rustc_span::Span;
@@ -747,7 +747,7 @@ impl<'a> AstValidator<'a> {
747747
id,
748748
span,
749749
fluent::ast_passes_extern_without_abi,
750-
BuiltinLintDiagnostics::MissingAbi(span, abi::Abi::FALLBACK),
750+
BuiltinLintDiag::MissingAbi(span, abi::Abi::FALLBACK),
751751
)
752752
}
753753
}
@@ -1405,7 +1405,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
14051405
FnCtxt::Foreign => fluent::ast_passes_pattern_in_foreign,
14061406
_ => fluent::ast_passes_pattern_in_bodiless,
14071407
};
1408-
let diag = BuiltinLintDiagnostics::PatternsInFnsWithoutBody(span, ident);
1408+
let diag = BuiltinLintDiag::PatternsInFnsWithoutBody(span, ident);
14091409
self.lint_buffer.buffer_lint_with_diagnostic(
14101410
PATTERNS_IN_FNS_WITHOUT_BODY,
14111411
id,
@@ -1482,10 +1482,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
14821482
item.id,
14831483
err.span,
14841484
fluent::ast_passes_deprecated_where_clause_location,
1485-
BuiltinLintDiagnostics::DeprecatedWhereclauseLocation(
1486-
err.sugg.right,
1487-
err.sugg.snippet,
1488-
),
1485+
BuiltinLintDiag::DeprecatedWhereclauseLocation(err.sugg.right, err.sugg.snippet),
14891486
);
14901487
}
14911488

‎compiler/rustc_attr/src/builtin.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use rustc_feature::{find_gated_cfg, is_builtin_attr_name, Features, GatedCfg};
88
use rustc_macros::HashStable_Generic;
99
use rustc_session::config::ExpectedValues;
1010
use rustc_session::lint::builtin::UNEXPECTED_CFGS;
11-
use rustc_session::lint::BuiltinLintDiagnostics;
11+
use rustc_session::lint::BuiltinLintDiag;
1212
use rustc_session::parse::feature_err;
1313
use rustc_session::{RustcVersion, Session};
1414
use rustc_span::hygiene::Transparency;
@@ -535,7 +535,7 @@ pub fn cfg_matches(
535535
} else {
536536
format!("unexpected `cfg` condition value: (none)")
537537
},
538-
BuiltinLintDiagnostics::UnexpectedCfgValue(
538+
BuiltinLintDiag::UnexpectedCfgValue(
539539
(cfg.name, cfg.name_span),
540540
cfg.value.map(|v| (v, cfg.value_span.unwrap())),
541541
),
@@ -547,7 +547,7 @@ pub fn cfg_matches(
547547
cfg.span,
548548
lint_node_id,
549549
format!("unexpected `cfg` condition name: `{}`", cfg.name),
550-
BuiltinLintDiagnostics::UnexpectedCfgName(
550+
BuiltinLintDiag::UnexpectedCfgName(
551551
(cfg.name, cfg.name_span),
552552
cfg.value.map(|v| (v, cfg.value_span.unwrap())),
553553
),

‎compiler/rustc_builtin_macros/src/deriving/generic/mod.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1607,18 +1607,19 @@ impl<'a> TraitDef<'a> {
16071607
// Once use of `icu4x-0.9.0` has dropped sufficiently, this
16081608
// exception should be removed.
16091609
let is_simple_path = |ty: &P<ast::Ty>, sym| {
1610-
if let TyKind::Path(None, ast::Path { segments, .. }) = &ty.kind &&
1611-
let [seg] = segments.as_slice() &&
1612-
seg.ident.name == sym && seg.args.is_none()
1610+
if let TyKind::Path(None, ast::Path { segments, .. }) = &ty.kind
1611+
&& let [seg] = segments.as_slice()
1612+
&& seg.ident.name == sym
1613+
&& seg.args.is_none()
16131614
{
16141615
true
16151616
} else {
16161617
false
16171618
}
16181619
};
16191620

1620-
let exception = if let TyKind::Slice(ty) = &struct_field.ty.kind &&
1621-
is_simple_path(ty, sym::u8)
1621+
let exception = if let TyKind::Slice(ty) = &struct_field.ty.kind
1622+
&& is_simple_path(ty, sym::u8)
16221623
{
16231624
Some("byte")
16241625
} else if is_simple_path(&struct_field.ty, sym::str) {
@@ -1635,7 +1636,7 @@ impl<'a> TraitDef<'a> {
16351636
format!(
16361637
"{ty} slice in a packed struct that derives a built-in trait"
16371638
),
1638-
rustc_lint_defs::BuiltinLintDiagnostics::ByteSliceInPackedStructWithDerive
1639+
rustc_lint_defs::BuiltinLintDiag::ByteSliceInPackedStructWithDerive,
16391640
);
16401641
} else {
16411642
// Wrap the expression in `{...}`, causing a copy.

‎compiler/rustc_builtin_macros/src/format.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use rustc_span::symbol::{Ident, Symbol};
1616
use rustc_span::{BytePos, ErrorGuaranteed, InnerSpan, Span};
1717

1818
use rustc_lint_defs::builtin::NAMED_ARGUMENTS_USED_POSITIONALLY;
19-
use rustc_lint_defs::{BufferedEarlyLint, BuiltinLintDiagnostics, LintId};
19+
use rustc_lint_defs::{BufferedEarlyLint, BuiltinLintDiag, LintId};
2020

2121
// The format_args!() macro is expanded in three steps:
2222
// 1. First, `parse_args` will parse the `(literal, arg, arg, name=arg, name=arg)` syntax,
@@ -553,7 +553,7 @@ fn make_format_args(
553553
msg: format!("named argument `{}` is not used by name", arg_name.name).into(),
554554
node_id: rustc_ast::CRATE_NODE_ID,
555555
lint_id: LintId::of(NAMED_ARGUMENTS_USED_POSITIONALLY),
556-
diagnostic: BuiltinLintDiagnostics::NamedArgumentUsedPositionally {
556+
diagnostic: BuiltinLintDiag::NamedArgumentUsedPositionally {
557557
position_sp_to_replace,
558558
position_sp_for_msg,
559559
named_arg_sp: arg_name.span,

‎compiler/rustc_expand/src/base.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use rustc_data_structures::sync::{self, Lrc};
1616
use rustc_errors::{Applicability, Diag, DiagCtxt, ErrorGuaranteed, PResult};
1717
use rustc_feature::Features;
1818
use rustc_lint_defs::builtin::PROC_MACRO_BACK_COMPAT;
19-
use rustc_lint_defs::{BufferedEarlyLint, BuiltinLintDiagnostics, RegisteredTools};
19+
use rustc_lint_defs::{BufferedEarlyLint, BuiltinLintDiag, RegisteredTools};
2020
use rustc_parse::{parser, MACRO_ARGUMENTS};
2121
use rustc_session::config::CollapseMacroDebuginfo;
2222
use rustc_session::errors::report_lit_error;
@@ -1492,7 +1492,7 @@ fn pretty_printing_compatibility_hack(item: &Item, sess: &Session) -> bool {
14921492
item.ident.span,
14931493
ast::CRATE_NODE_ID,
14941494
"using an old version of `rental`",
1495-
BuiltinLintDiagnostics::ProcMacroBackCompat(
1495+
BuiltinLintDiag::ProcMacroBackCompat(
14961496
"older versions of the `rental` crate will stop compiling in future versions of Rust; \
14971497
please update to `rental` v0.5.6, or switch to one of the `rental` alternatives".to_string()
14981498
)

‎compiler/rustc_expand/src/expand.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use rustc_parse::parser::{
3030
};
3131
use rustc_parse::validate_attr;
3232
use rustc_session::lint::builtin::{UNUSED_ATTRIBUTES, UNUSED_DOC_COMMENTS};
33-
use rustc_session::lint::BuiltinLintDiagnostics;
33+
use rustc_session::lint::BuiltinLintDiag;
3434
use rustc_session::parse::feature_err;
3535
use rustc_session::{Limit, Session};
3636
use rustc_span::symbol::{sym, Ident};
@@ -1715,7 +1715,7 @@ impl<'a, 'b> InvocationCollector<'a, 'b> {
17151715
current_span,
17161716
self.cx.current_expansion.lint_node_id,
17171717
"unused doc comment",
1718-
BuiltinLintDiagnostics::UnusedDocComment(attr.span),
1718+
BuiltinLintDiag::UnusedDocComment(attr.span),
17191719
);
17201720
} else if rustc_attr::is_builtin_attr(attr) {
17211721
let attr_name = attr.ident().unwrap().name;
@@ -1727,7 +1727,7 @@ impl<'a, 'b> InvocationCollector<'a, 'b> {
17271727
attr.span,
17281728
self.cx.current_expansion.lint_node_id,
17291729
format!("unused attribute `{attr_name}`"),
1730-
BuiltinLintDiagnostics::UnusedBuiltinAttribute {
1730+
BuiltinLintDiag::UnusedBuiltinAttribute {
17311731
attr_name,
17321732
macro_name: pprust::path_to_string(&call.path),
17331733
invoc_span: call.path.span,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use rustc_feature::Features;
2121
use rustc_lint_defs::builtin::{
2222
RUST_2021_INCOMPATIBLE_OR_PATTERNS, SEMICOLON_IN_EXPRESSIONS_FROM_MACROS,
2323
};
24-
use rustc_lint_defs::BuiltinLintDiagnostics;
24+
use rustc_lint_defs::BuiltinLintDiag;
2525
use rustc_parse::parser::{Parser, Recovery};
2626
use rustc_session::parse::ParseSess;
2727
use rustc_session::Session;
@@ -83,7 +83,7 @@ impl<'a> ParserAnyMacro<'a> {
8383
parser.token.span,
8484
lint_node_id,
8585
"trailing semicolon in macro used in expression position",
86-
BuiltinLintDiagnostics::TrailingMacro(is_trailing_mac, macro_ident),
86+
BuiltinLintDiag::TrailingMacro(is_trailing_mac, macro_ident),
8787
);
8888
}
8989
parser.bump();
@@ -1154,7 +1154,7 @@ fn check_matcher_core<'tt>(
11541154
span,
11551155
ast::CRATE_NODE_ID,
11561156
"the meaning of the `pat` fragment specifier is changing in Rust 2021, which may affect this macro",
1157-
BuiltinLintDiagnostics::OrPatternsBackCompat(span, suggestion),
1157+
BuiltinLintDiag::OrPatternsBackCompat(span, suggestion),
11581158
);
11591159
}
11601160
match is_in_follow(next_token, kind) {

‎compiler/rustc_interface/src/util.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use rustc_parse::validate_attr;
99
use rustc_session as session;
1010
use rustc_session::config::{self, Cfg, CrateType, OutFileName, OutputFilenames, OutputTypes};
1111
use rustc_session::filesearch::sysroot_candidates;
12-
use rustc_session::lint::{self, BuiltinLintDiagnostics, LintBuffer};
12+
use rustc_session::lint::{self, BuiltinLintDiag, LintBuffer};
1313
use rustc_session::{filesearch, output, Session};
1414
use rustc_span::edit_distance::find_best_match_for_name;
1515
use rustc_span::edition::Edition;
@@ -345,7 +345,7 @@ pub(crate) fn check_attr_crate_type(
345345
ast::CRATE_NODE_ID,
346346
span,
347347
"invalid `crate_type` value",
348-
BuiltinLintDiagnostics::UnknownCrateTypes(
348+
BuiltinLintDiag::UnknownCrateTypes(
349349
span,
350350
"did you mean".to_string(),
351351
format!("\"{candidate}\""),

‎compiler/rustc_lint/src/builtin.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ use rustc_middle::ty::GenericArgKind;
5858
use rustc_middle::ty::ToPredicate;
5959
use rustc_middle::ty::TypeVisitableExt;
6060
use rustc_middle::ty::{self, Ty, TyCtxt, VariantDef};
61-
use rustc_session::lint::{BuiltinLintDiagnostics, FutureIncompatibilityReason};
61+
use rustc_session::lint::{BuiltinLintDiag, FutureIncompatibilityReason};
6262
use rustc_span::edition::Edition;
6363
use rustc_span::source_map::Spanned;
6464
use rustc_span::symbol::{kw, sym, Ident, Symbol};
@@ -2831,7 +2831,7 @@ impl<'tcx> LateLintPass<'tcx> for NamedAsmLabels {
28312831
Some(target_spans),
28322832
fluent::lint_builtin_asm_labels,
28332833
|_| {},
2834-
BuiltinLintDiagnostics::NamedAsmLabel(
2834+
BuiltinLintDiag::NamedAsmLabel(
28352835
"only local labels of the form `<number>:` should be used in inline asm"
28362836
.to_string(),
28372837
),

‎compiler/rustc_lint/src/context.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ use rustc_middle::middle::privacy::EffectiveVisibilities;
3131
use rustc_middle::ty::layout::{LayoutError, LayoutOfHelpers, TyAndLayout};
3232
use rustc_middle::ty::print::{with_no_trimmed_paths, PrintError};
3333
use rustc_middle::ty::{self, print::Printer, GenericArg, RegisteredTools, Ty, TyCtxt};
34-
use rustc_session::lint::{BuiltinLintDiagnostics, LintExpectationId};
34+
use rustc_session::lint::{BuiltinLintDiag, LintExpectationId};
3535
use rustc_session::lint::{FutureIncompatibleInfo, Level, Lint, LintBuffer, LintId};
3636
use rustc_session::{LintStoreMarker, Session};
3737
use rustc_span::edit_distance::find_best_match_for_names;
@@ -538,7 +538,7 @@ pub trait LintContext {
538538
span: Option<impl Into<MultiSpan>>,
539539
msg: impl Into<DiagMessage>,
540540
decorate: impl for<'a, 'b> FnOnce(&'b mut Diag<'a, ()>),
541-
diagnostic: BuiltinLintDiagnostics,
541+
diagnostic: BuiltinLintDiag,
542542
) {
543543
// We first generate a blank diagnostic.
544544
self.opt_span_lint(lint, span, msg, |db| {

0 commit comments

Comments
 (0)