From 58a3e5fbdf81a2daf59d9540f3ae34ae381ba7e9 Mon Sep 17 00:00:00 2001
From: Freja Roberts <ten3roberts@gmail.com>
Date: Tue, 26 Mar 2024 13:36:40 +0100
Subject: [PATCH] fix: ci breaking due to new dependencies and rustc changes

---
 color-eyre/tests/theme.rs | 4 +++-
 eyre/Cargo.toml           | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/color-eyre/tests/theme.rs b/color-eyre/tests/theme.rs
index 939b02f..716aaef 100644
--- a/color-eyre/tests/theme.rs
+++ b/color-eyre/tests/theme.rs
@@ -124,6 +124,8 @@ fn test_panic_backwards_compatibility() {
         .args(["run", "--example", "theme_test_helper"])
         .arg("--no-default-features")
         .args(&features)
+        .env("RUSTFLAGS", "-Awarnings")
+        .env("CARGO_FUTURE_INCOMPAT_REPORT_FREQUENCY", "never")
         .output()
         .expect("failed to execute process");
     let target = String::from_utf8(output.stderr).expect("failed to convert output to `String`");
@@ -168,7 +170,7 @@ fn test_backwards_compatibility(target: String, file_name: &str) {
     fn normalize_backtrace(input: &str) -> String {
         input
             .lines()
-            .take_while(|v| !v.contains("core::panic"))
+            .take_while(|v| !v.contains("core::panic") && !v.contains("theme_test_helper::main"))
             .collect::<Vec<_>>()
             .join("\n")
     }
diff --git a/eyre/Cargo.toml b/eyre/Cargo.toml
index 1085cbb..6848126 100644
--- a/eyre/Cargo.toml
+++ b/eyre/Cargo.toml
@@ -27,7 +27,7 @@ pyo3 = { version = "0.20", optional = true, default-features = false }
 futures = { version = "0.3", default-features = false }
 rustversion = "1.0"
 thiserror = "1.0"
-trybuild = { version = "1.0.19", features = ["diff"] }
+trybuild = { version = "=1.0.83", features = ["diff"] }
 backtrace = "0.3.46"
 anyhow = "1.0.28"
 syn = { version = "2.0", features = ["full"] }