bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename DiagnosticStyledString as DiagStyledString.

Browse source
This commit is contained in:
Nicholas Nethercote 2024-02-23 16:01:50 +11:00
parent 6280a8c3fe
commit 9b3520e876
5 changed files with 53 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

24
compiler/rustc_errors/src/diagnostic.rs
View file

@ -213,11 +213,11 @@ pub struct IsLint {
}
#[derive(Debug, PartialEq, Eq)]
pub struct DiagnosticStyledString(pub Vec<StringPart>);
pub struct DiagStyledString(pub Vec<StringPart>);
impl DiagnosticStyledString {
pub fn new() -> DiagnosticStyledString {
DiagnosticStyledString(vec![])
impl DiagStyledString {
pub fn new() -> DiagStyledString {
DiagStyledString(vec![])
}
pub fn push_normal<S: Into<String>>(&mut self, t: S) {
self.0.push(StringPart::normal(t));
@ -232,12 +232,12 @@ impl DiagnosticStyledString {
self.push_normal(t);
}
}
pub fn normal<S: Into<String>>(t: S) -> DiagnosticStyledString {
DiagnosticStyledString(vec![StringPart::normal(t)])
pub fn normal<S: Into<String>>(t: S) -> DiagStyledString {
DiagStyledString(vec![StringPart::normal(t)])
}
pub fn highlighted<S: Into<String>>(t: S) -> DiagnosticStyledString {
DiagnosticStyledString(vec![StringPart::highlighted(t)])
pub fn highlighted<S: Into<String>>(t: S) -> DiagStyledString {
DiagStyledString(vec![StringPart::highlighted(t)])
}
pub fn content(&self) -> String {
@ -638,9 +638,9 @@ impl<'a, G: EmissionGuarantee> Diag<'a, G> {
pub fn note_expected_found(
&mut self,
expected_label: &dyn fmt::Display,
expected: DiagnosticStyledString,
expected: DiagStyledString,
found_label: &dyn fmt::Display,
found: DiagnosticStyledString,
found: DiagStyledString,
) -> &mut Self {
self.note_expected_found_extra(expected_label, expected, found_label, found, &"", &"")
}
@ -648,9 +648,9 @@ impl<'a, G: EmissionGuarantee> Diag<'a, G> {
pub fn note_expected_found_extra(
&mut self,
expected_label: &dyn fmt::Display,
expected: DiagnosticStyledString,
expected: DiagStyledString,
found_label: &dyn fmt::Display,
found: DiagnosticStyledString,
found: DiagStyledString,
expected_extra: &dyn fmt::Display,
found_extra: &dyn fmt::Display,
) -> &mut Self {