From fc83cb8125bdde3a3b06e8b06c3405f6fc040a8a Mon Sep 17 00:00:00 2001 From: Nikita Bishonen Date: Thu, 22 Aug 2024 15:26:43 +0400 Subject: [PATCH] chore(color-eyre): Set color-eyre dependency on eyre via path. (#197) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Good day, dear eyre contributors. I really like to use eyre in all my projects. Right now I use master to stay on 1.0 version. Unfortunately when I want to start using color-eyre the same way it conflicts with eyre, because it uses 0.6.1 version. What this PR addresses is to temporary set color-eyre -> eyre dependency via path, not a version, until 1.0 will be released. If it's not something you want to have in the codebase, just please let me know, I will then switch to my fork and keep it sync with the main repo. Thank you in advance, you are awesome! 💜 --- Cargo.lock | 13 ++----------- color-eyre/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c98d750..45d4183 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,7 +121,7 @@ dependencies = [ "ansi-parser", "backtrace", "color-spantrace", - "eyre 0.6.12", + "eyre", "indenter", "once_cell", "owo-colors", @@ -169,21 +169,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" -[[package]] -name = "eyre" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" -dependencies = [ - "indenter", - "once_cell", -] - [[package]] name = "eyre" version = "1.0.0" dependencies = [ "anyhow", + "autocfg", "backtrace", "futures", "indenter", diff --git a/color-eyre/Cargo.toml b/color-eyre/Cargo.toml index 145fb17..2b5b658 100644 --- a/color-eyre/Cargo.toml +++ b/color-eyre/Cargo.toml @@ -18,7 +18,7 @@ issue-url = ["url"] track-caller = [] [dependencies] -eyre = "0.6.1" +eyre = { version = "1.0.0", path = "../eyre" } tracing-error = { version = "0.2.0", optional = true } backtrace = { version = "0.3.59" } indenter = { workspace = true }