diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:50 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:50 +0000 |
commit | 9835e2ae736235810b4ea1c162ca5e65c547e770 (patch) | |
tree | 3fcebf40ed70e581d776a8a4c65923e8ec20e026 /vendor/snapbox-macros | |
parent | Releasing progress-linux version 1.70.0+dfsg2-1~progress7.99u1. (diff) | |
download | rustc-9835e2ae736235810b4ea1c162ca5e65c547e770.tar.xz rustc-9835e2ae736235810b4ea1c162ca5e65c547e770.zip |
Merging upstream version 1.71.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/snapbox-macros')
-rw-r--r-- | vendor/snapbox-macros/.cargo-checksum.json | 2 | ||||
-rw-r--r-- | vendor/snapbox-macros/Cargo.toml | 10 | ||||
-rw-r--r-- | vendor/snapbox-macros/src/lib.rs | 13 |
3 files changed, 18 insertions, 7 deletions
diff --git a/vendor/snapbox-macros/.cargo-checksum.json b/vendor/snapbox-macros/.cargo-checksum.json index 817371e53..fbe533df9 100644 --- a/vendor/snapbox-macros/.cargo-checksum.json +++ b/vendor/snapbox-macros/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"b267e7e42aad852943ccb301dcd3497eb0858f083a420a7b0d1c2ad8303de804","README.md":"4fc2a7458a321d6a037e3c63c5b0c79679bb5cf430b3e1107b05e60c108a8bdd","src/lib.rs":"b33bddef438cf49c282eea703139ad32d97c2083a952fea980d0d4a3c4abab8d"},"package":"8a253e6f894cfa440cba00600a249fa90869d8e0ec45ab274a456e043a0ce8f2"}
\ No newline at end of file +{"files":{"Cargo.toml":"4f674ff9a4da69aa84dceff5afdd2eeac6efa9487e0a5c84ffe27d1bbc8a4c3b","README.md":"4fc2a7458a321d6a037e3c63c5b0c79679bb5cf430b3e1107b05e60c108a8bdd","src/lib.rs":"c17a016d80eb9538f4f7191cd040c025afbd6a9f4f664e44b2f02f53cd177722"},"package":"f8e40c667388ed1cb5060f545d0013bf0a23efdfa6c5c3e9ef592de391cd860f"}
\ No newline at end of file diff --git a/vendor/snapbox-macros/Cargo.toml b/vendor/snapbox-macros/Cargo.toml index ca0310c8e..abafa78e3 100644 --- a/vendor/snapbox-macros/Cargo.toml +++ b/vendor/snapbox-macros/Cargo.toml @@ -11,9 +11,9 @@ [package] edition = "2021" -rust-version = "1.56.1" +rust-version = "1.64.0" name = "snapbox-macros" -version = "0.3.0" +version = "0.3.3" include = [ "build.rs", "src/**/*", @@ -36,13 +36,15 @@ keywords = [ categories = ["development-tools::testing"] license = "MIT OR Apache-2.0" repository = "https://github.com/assert-rs/trycmd/" -resolver = "2" [package.metadata.docs.rs] all-features = true -[dependencies] +[dependencies.anstream] +version = "0.2.1" +optional = true [features] +color = ["dep:anstream"] debug = [] default = [] diff --git a/vendor/snapbox-macros/src/lib.rs b/vendor/snapbox-macros/src/lib.rs index 8cc828e1b..a9e0461f8 100644 --- a/vendor/snapbox-macros/src/lib.rs +++ b/vendor/snapbox-macros/src/lib.rs @@ -1,10 +1,19 @@ +#[cfg(feature = "color")] +pub use anstream::eprint; +#[cfg(feature = "color")] +pub use anstream::eprintln; +#[cfg(not(feature = "color"))] +pub use std::eprint; +#[cfg(not(feature = "color"))] +pub use std::eprintln; + /// Feature-flag controlled additional test debug information #[cfg(feature = "debug")] #[macro_export] macro_rules! debug { ($($arg:tt)*) => ({ - eprint!("[{:>w$}] \t", module_path!(), w = 28); - eprintln!($($arg)*); + $crate::eprint!("[{:>w$}] \t", module_path!(), w = 28); + $crate::eprintln!($($arg)*); }) } |