From e4284733fa57235416415d0556015f96a0c352df Mon Sep 17 00:00:00 2001 From: HampusM Date: Wed, 2 Aug 2023 16:14:54 +0200 Subject: build: improve the fix for the predicates-tree MSRV change Dependents won't be prevented from using a newer version of predicates-tree now --- Cargo.toml | 6 ++++-- macros/Cargo.toml | 9 --------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6c7d6bd..3d343db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,8 +64,10 @@ tokio = { version = "1.20.1", features = ["macros", "rt-multi-thread", "time"] } # # Follow this on # https://github.com/asomers/mockall/issues/507 -predicates-tree = "=1.0.7" -predicates-core = "=1.0.5" +[patch.crates-io] +predicates-tree = { git = "https://github.com/assert-rs/predicates-rs", tag = "v2.1.3", version = "^1.0.7" } +predicates-core = { git = "https://github.com/assert-rs/predicates-rs", tag = "v2.1.3", version = "^1.0.5" } + [workspace] members = [ diff --git a/macros/Cargo.toml b/macros/Cargo.toml index 7349bed..ccf10cd 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -37,12 +37,3 @@ pretty_assertions = "1.3.0" syn = { version = "1.0.96", features = ["full", "extra-traits"] } utility-macros = { git = "https://git.hampusmat.com/utility-macros" } -# The following is needed because of this change: -# https://github.com/assert-rs/predicates-rs/commit/7a961436d8c2b9cf09e9576a0c9341acb302f49c -# -# The predicates family of crates is a dependency of mockall. -# -# Follow this on -# https://github.com/asomers/mockall/issues/507 -predicates-tree = "=1.0.7" -predicates-core = "=1.0.5" -- cgit v1.2.3-18-g5258