Commit 1a2fa7e

authored

Merge pull request rust-lang#274 from Muscraft/add-report

feat: Add top-level Report type

2 parents e526c18 + dbef156 commit 1a2fa7eCopy full SHA for 1a2fa7e

File tree

+11

-2

lines changed

+11

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,9 @@ use crate::renderer::source_map::{`
`48`	`48`	`};`
`49`	`49`	`use crate::renderer::styled_buffer::StyledBuffer;`
`50`	`50`	`use crate::snippet::Id;`
`51`		`-use crate::{Annotation, AnnotationKind, Element, Group, Message, Origin, Patch, Snippet, Title};`
	`51`	`+use crate::{`
	`52`	`+ Annotation, AnnotationKind, Element, Group, Message, Origin, Patch, Report, Snippet, Title,`
	`53`	`+};`
`52`	`54`	`pub use anstyle::*;`
`53`	`55`	`use margin::Margin;`
`54`	`56`	`use std::borrow::Cow;`
`@@ -225,7 +227,7 @@ impl Renderer {`
`225`	`227`
`226`	`228`	`impl Renderer {`
`227`	`229`	/// Render a diagnostic, a series of [`Group`]s
`228`		`- pub fn render(&self, groups: &[Group<'_>]) -> String {`
	`230`	`+ pub fn render(&self, groups: Report<'_>) -> String {`
`229`	`231`	`if self.short_message {`
`230`	`232`	`self.render_short_message(groups).unwrap()`
`231`	`233`	`} else {`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,13 @@ pub(crate) const INFO_TXT: &str = "info";`
`11`	`11`	`pub(crate) const NOTE_TXT: &str = "note";`
`12`	`12`	`pub(crate) const WARNING_TXT: &str = "warning";`
`13`	`13`
	`14`	`+/// A [diagnostic message][Title] and any associated context to help users`
	`15`	`+/// understand it`
	`16`	`+///`
	`17`	+/// The first [`Group`] is the "primary" group, ie it contains the diagnostic
	`18`	+/// message. All subsequent [`Group`]s are for distinct pieces of context.
	`19`	`+pub type Report<'a> = &'a [Group<'a>];`
	`20`	`+`
`14`	`21`	`#[derive(Clone, Debug, Default)]`
`15`	`22`	`pub(crate) struct Id<'a> {`
`16`	`23`	`pub(crate) id: Option<Cow<'a, str>>,`

Comments

(0)