Merge remote-tracking branch 'origin/master' into color-eyre

eyre-rs · Mar 14, 2024 · eb8d059 · eb8d059
2 parents cb4bab6 + 75beaae
commit eb8d059
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/color-spantrace/Cargo.toml b/color-spantrace/Cargo.toml
@@ -14,7 +14,7 @@ rust-version = { workspace = true }
 [dependencies]
 tracing-error = "0.2.0"
 tracing-core = "0.1.21"
-owo-colors = { workspace = true }
+owo-colors = "4.0"
 once_cell = { workspace = true }
 
 [dev-dependencies]

diff --git a/eyre/tests/test_location.rs b/eyre/tests/test_location.rs
@@ -1,7 +1,5 @@
 use std::panic::Location;
 
-use eyre::WrapErr;
-
 struct LocationHandler {
     actual: Option<&'static str>,
     expected: &'static str,
@@ -46,6 +44,7 @@ fn test_wrap_err() {
         Box::new(LocationHandler::new(expected_location))
     }));
 
+    use eyre::WrapErr;
     let err = read_path("totally_fake_path")
         .wrap_err("oopsie")
         .unwrap_err();
@@ -75,6 +74,7 @@ fn test_wrap_err_with() {
         Box::new(LocationHandler::new(expected_location))
     }));
 
+    use eyre::WrapErr;
     let err = read_path("totally_fake_path")
         .wrap_err_with(|| "oopsie")
         .unwrap_err();
@@ -83,7 +83,6 @@ fn test_wrap_err_with() {
     println!("{:?}", err);
 }
 
-#[cfg(feature = "anyhow")]
 #[test]
 fn test_option_ok_or_eyre() {
     let _ = eyre::set_hook(Box::new(|_e| {
@@ -106,6 +105,7 @@ fn test_context() {
         Box::new(LocationHandler::new(expected_location))
     }));
 
+    use eyre::WrapErr;
     let err = read_path("totally_fake_path")
         .context("oopsie")
         .unwrap_err();
@@ -122,6 +122,7 @@ fn test_with_context() {
         Box::new(LocationHandler::new(expected_location))
     }));
 
+    use eyre::WrapErr;
     let err = read_path("totally_fake_path")
         .with_context(|| "oopsie")
         .unwrap_err();