Skip to content

Commit 8da43b9

Browse files
committed
Rename DiagnosticSymbolList as DiagSymbolList.
1 parent 30a9b65 commit 8da43b9

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

compiler/rustc_errors/src/diagnostic_impls.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -227,15 +227,15 @@ impl IntoDiagnosticArg for rustc_lint_defs::Level {
227227
}
228228

229229
#[derive(Clone)]
230-
pub struct DiagnosticSymbolList(Vec<Symbol>);
230+
pub struct DiagSymbolList(Vec<Symbol>);
231231

232-
impl From<Vec<Symbol>> for DiagnosticSymbolList {
232+
impl From<Vec<Symbol>> for DiagSymbolList {
233233
fn from(v: Vec<Symbol>) -> Self {
234-
DiagnosticSymbolList(v)
234+
DiagSymbolList(v)
235235
}
236236
}
237237

238-
impl IntoDiagnosticArg for DiagnosticSymbolList {
238+
impl IntoDiagnosticArg for DiagSymbolList {
239239
fn into_diagnostic_arg(self) -> DiagArgValue {
240240
DiagArgValue::StrListSepByAnd(
241241
self.0.into_iter().map(|sym| Cow::Owned(format!("`{sym}`"))).collect(),

compiler/rustc_errors/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pub use diagnostic::{
4242
IntoDiagnosticArg, StringPart, Subdiag, SubdiagnosticMessageOp,
4343
};
4444
pub use diagnostic_impls::{
45-
DiagArgFromDisplay, DiagnosticSymbolList, ExpectedLifetimeParameter, IndicateAnonymousLifetime,
45+
DiagArgFromDisplay, DiagSymbolList, ExpectedLifetimeParameter, IndicateAnonymousLifetime,
4646
SingleLabelManySpans,
4747
};
4848
pub use emitter::ColorConfig;

compiler/rustc_passes/src/errors.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use std::{
66
use crate::fluent_generated as fluent;
77
use rustc_ast::Label;
88
use rustc_errors::{
9-
codes::*, AddToDiagnostic, Applicability, Diag, DiagCtxt, DiagnosticSymbolList,
10-
EmissionGuarantee, IntoDiagnostic, Level, MultiSpan, SubdiagnosticMessageOp,
9+
codes::*, AddToDiagnostic, Applicability, Diag, DiagCtxt, DiagSymbolList, EmissionGuarantee,
10+
IntoDiagnostic, Level, MultiSpan, SubdiagnosticMessageOp,
1111
};
1212
use rustc_hir::{self as hir, ExprKind, Target};
1313
use rustc_macros::{Diagnostic, LintDiagnostic, Subdiagnostic};
@@ -1565,7 +1565,7 @@ pub enum MultipleDeadCodes<'tcx> {
15651565
num: usize,
15661566
descr: &'tcx str,
15671567
participle: &'tcx str,
1568-
name_list: DiagnosticSymbolList,
1568+
name_list: DiagSymbolList,
15691569
#[subdiagnostic]
15701570
parent_info: Option<ParentInfo<'tcx>>,
15711571
#[subdiagnostic]
@@ -1577,7 +1577,7 @@ pub enum MultipleDeadCodes<'tcx> {
15771577
num: usize,
15781578
descr: &'tcx str,
15791579
participle: &'tcx str,
1580-
name_list: DiagnosticSymbolList,
1580+
name_list: DiagSymbolList,
15811581
#[subdiagnostic]
15821582
change_fields_suggestion: ChangeFieldsToBeOfUnitType,
15831583
#[subdiagnostic]
@@ -1601,7 +1601,7 @@ pub struct ParentInfo<'tcx> {
16011601
#[note(passes_ignored_derived_impls)]
16021602
pub struct IgnoredDerivedImpls {
16031603
pub name: Symbol,
1604-
pub trait_list: DiagnosticSymbolList,
1604+
pub trait_list: DiagSymbolList,
16051605
pub trait_list_len: usize,
16061606
}
16071607

0 commit comments

Comments
 (0)