Skip to content

Commit 750637c

Browse files
authored
Merge pull request #188 from klensy/annotate-snippets-0.10
bump annotate-snippets to 0.10
2 parents f02168c + 329d5f5 commit 750637c

File tree

9 files changed

+71
-91
lines changed

9 files changed

+71
-91
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2525
* Updating `cargo_metadata` to `0.18`
2626
* Updated `spanned` to `0.1.5`, giving more precise spans for more iterator operations
2727
* `Config::cfgs` is now `Config::program::cfg_flag`
28+
* Bumped `annotate-snippets` to `0.10`
2829

2930
### Removed
3031

Cargo.lock

Lines changed: 9 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ comma = "1.0.0"
2727
anyhow = "1.0.6"
2828
indicatif = "0.17.6"
2929
prettydiff = { version = "0.6.4", default_features = false }
30-
annotate-snippets = { version = "0.9.1", features = ["color"] }
30+
annotate-snippets = { version = "0.10.0" }
3131
levenshtein = "1.0.5"
3232
spanned = "0.1.5"
3333

src/status_emitter.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
//! Variaous schemes for reporting messages during testing or after testing is done.
22
3-
use annotate_snippets::{
4-
display_list::{DisplayList, FormatOptions},
5-
snippet::{Annotation, AnnotationType, Slice, Snippet, SourceAnnotation},
6-
};
3+
use annotate_snippets::{Annotation, AnnotationType, Renderer, Slice, Snippet, SourceAnnotation};
74
use bstr::ByteSlice;
85
use colored::Colorize;
96
use crossbeam_channel::{Sender, TryRecvError};
@@ -642,13 +639,13 @@ fn create_error(
642639
})
643640
.collect(),
644641
footer: vec![],
645-
opt: FormatOptions {
646-
color: colored::control::SHOULD_COLORIZE.should_colorize(),
647-
anonymized_line_numbers: false,
648-
margin: None,
649-
},
650642
};
651-
println!("{}", DisplayList::from(msg));
643+
let renderer = if colored::control::SHOULD_COLORIZE.should_colorize() {
644+
Renderer::styled()
645+
} else {
646+
Renderer::plain()
647+
};
648+
println!("{}", renderer.render(msg));
652649
}
653650

654651
fn gha_error(error: &Error, test_path: &str, revision: &str) {

tests/integrations/basic-bin/Cargo.lock

Lines changed: 11 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/integrations/basic-fail-mode/Cargo.lock

Lines changed: 11 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/integrations/basic-fail/Cargo.lock

Lines changed: 11 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/integrations/basic/Cargo.lock

Lines changed: 9 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/integrations/cargo-run/Cargo.lock

Lines changed: 11 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)