bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

librustc_errors: Support ui-testing flag in annotate-snippet emitter

Browse source 
This adds support for the `-Z ui-testing` flag to the new
annotate-snippet diagnostic emitter.

The support for the flag was added to `annotate-snippet-rs` in these PRs:

* https://github.com/rust-lang/annotate-snippets-rs/pull/3
* https://github.com/rust-lang/annotate-snippets-rs/pull/5

Closes #61811
This commit is contained in:
Philipp Hansch 2019-07-25 21:03:53 +02:00
parent 4b65a86eba
commit dd0f2ac250
No known key found for this signature in database
GPG key ID: 82AA61CAA11397E6
4 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustc_errors/annotate_snippet_emitter_writer.rs
View file

@ -23,7 +23,7 @@ pub struct AnnotateSnippetEmitterWriter {
source_map: Option<Lrc<SourceMapperDyn>>,
/// If true, hides the longer explanation text
short_message: bool,
/// If true, will normalize line numbers with LL to prevent noise in UI test diffs.
/// If true, will normalize line numbers with `LL` to prevent noise in UI test diffs.
ui_testing: bool,
}
@ -173,10 +173,6 @@ impl AnnotateSnippetEmitterWriter {
/// Allows to modify `Self` to enable or disable the `ui_testing` flag.
///
/// If this is set to true, line numbers will be normalized as `LL` in the output.
// FIXME(#59346): This method is used via the public interface, but setting the `ui_testing`
// flag currently does not anonymize line numbers. We would have to add the `maybe_anonymized`
// method from `emitter.rs` and implement rust-lang/annotate-snippets-rs#2 in order to
// anonymize line numbers.
pub fn ui_testing(mut self, ui_testing: bool) -> Self {
self.ui_testing = ui_testing;
self
@ -202,7 +198,7 @@ impl AnnotateSnippetEmitterWriter {
};
if let Some(snippet) = converter.to_annotation_snippet() {
let dl = DisplayList::from(snippet);
let dlf = DisplayListFormatter::new(true);
let dlf = DisplayListFormatter::new(true, self.ui_testing);
// FIXME(#59346): Figure out if we can _always_ print to stderr or not.
// `emitter.rs` has the `Destination` enum that lists various possible output
// destinations.