From a0b8f38ab54ac451646aa00cd5e91b6c76f22a84 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 05:57:19 +0200 Subject: Merging upstream version 1.72.1+dfsg1. Signed-off-by: Daniel Baumann --- vendor/snapbox/src/data.rs | 2 +- vendor/snapbox/src/report/color.rs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'vendor/snapbox/src') diff --git a/vendor/snapbox/src/data.rs b/vendor/snapbox/src/data.rs index aa5f9b1ed..ab4432c1e 100644 --- a/vendor/snapbox/src/data.rs +++ b/vendor/snapbox/src/data.rs @@ -10,7 +10,7 @@ pub struct Data { enum DataInner { Binary(Vec), Text(String), - #[cfg(feature = "structured-data")] + #[cfg(feature = "json")] Json(serde_json::Value), } diff --git a/vendor/snapbox/src/report/color.rs b/vendor/snapbox/src/report/color.rs index 1b74a3c58..38f4f8fc8 100644 --- a/vendor/snapbox/src/report/color.rs +++ b/vendor/snapbox/src/report/color.rs @@ -12,12 +12,12 @@ impl Palette { pub fn color() -> Self { if cfg!(feature = "color") { Self { - info: anstyle::AnsiColor::Green.into(), - warn: anstyle::AnsiColor::Yellow.into(), - error: anstyle::AnsiColor::Red.into(), + info: anstyle::AnsiColor::Green.on_default(), + warn: anstyle::AnsiColor::Yellow.on_default(), + error: anstyle::AnsiColor::Red.on_default(), hint: anstyle::Effects::DIMMED.into(), - expected: anstyle::AnsiColor::Green | anstyle::Effects::UNDERLINE, - actual: anstyle::AnsiColor::Red | anstyle::Effects::UNDERLINE, + expected: anstyle::AnsiColor::Green.on_default() | anstyle::Effects::UNDERLINE, + actual: anstyle::AnsiColor::Red.on_default() | anstyle::Effects::UNDERLINE, } } else { Self::plain() -- cgit v1.2.3