Merge pull request #165 from epage/anstream

fix: Improve color output detection

.clippy.toml

@@ -1 +1 @@
-msrv = "1.60.0"  # MSRV
+msrv = "1.64.0"  # MSRV

.github/workflows/ci.yml

@@ -51,15 +51,15 @@ jobs:
     - name: No-default features
       run: cargo test --workspace --no-default-features
   msrv:
-    name: "Check MSRV: 1.60.0"
+    name: "Check MSRV: 1.64.0"
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
       uses: actions/checkout@v3
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.60.0  # MSRV
+        toolchain: 1.64.0  # MSRV
         profile: minimal
         override: true
     - uses: Swatinem/rust-cache@v2
@@ -113,7 +113,7 @@ jobs:
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.60.0  # MSRV
+        toolchain: 1.64.0  # MSRV
         profile: minimal
         override: true
         components: clippy

.github/workflows/rust-next.yml

@@ -59,9 +59,9 @@ jobs:
     strategy:
       matrix:
         rust:
-        - 1.60.0  # MSRV
+        - 1.64.0  # MSRV
         - stable
-    continue-on-error: ${{ matrix.rust != '1.60.0' }}  # MSRV
+    continue-on-error: ${{ matrix.rust != '1.64.0' }}  # MSRV
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository

Cargo.toml

@@ -11,7 +11,7 @@ readme = "README.md"
 categories = ["development-tools::testing"]
 keywords = ["cli", "test", "assert", "command", "duct"]
 edition = "2021"
-rust-version = "1.60.0"  # MSRV
+rust-version = "1.64.0"  # MSRV
 include = [
   "build.rs",
   "src/**/*",
@@ -32,21 +32,21 @@ pre-release-replacements = [
 ]
 
 [features]
-color = ["dep:yansi", "dep:concolor", "concolor?/std", "predicates/color"]
-color-auto = ["color", "concolor?/auto"]
+color = ["dep:anstyle-stream", "predicates/color"]
+color-auto = ["color"]
 
 [[bin]]
 name = "bin_fixture"
 
 [dependencies]
-predicates = { version = "2.1", default-features = false, features = ["diff"] }
-predicates-core = "1.0"
-predicates-tree = "1.0"
+predicates = { version = "3.0.1", default-features = false, features = ["diff"] }
+predicates-core = "1.0.6"
+predicates-tree = "1.0.1"
 doc-comment = "0.3"
 wait-timeout = "0.2.0"
 bstr = "1.0.1"
-yansi = { version = "0.5.1", optional = true }
-concolor = { version = "0.0.12", optional = true }
+anstyle-stream = { version = "0.2.1", optional = true }
+anstyle = "0.3.1"
 
 [dev-dependencies]
 escargot = "0.5"

src/assert.rs

@@ -6,6 +6,8 @@ use std::fmt;
 use std::process;
 use std::str;
 
+#[cfg(feature = "color")]
+use anstyle_stream::panic;
 use predicates::str::PredicateStrExt;
 use predicates_tree::CaseTreeExt;
 
@@ -482,14 +484,9 @@ impl Assert {
 
 impl fmt::Display for Assert {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let palette = crate::Palette::current();
+        let palette = crate::Palette::color();
         for &(ref name, ref context) in &self.context {
-            writeln!(
-                f,
-                "{}=`{}`",
-                palette.key.paint(name),
-                palette.value.paint(context)
-            )?;
+            writeln!(f, "{:#}=`{:#}`", palette.key(name), palette.value(context))?;
         }
         output_fmt(&self.output, f)
     }