From 78080f04f9fa3597ce871e2997af5e2dea955a09 Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Mon, 10 Oct 2016 10:50:25 -0400 Subject: [PATCH] Fix test failures We appear to no longer be able to use `paths =` from `.cargo/config`, as it blows up when the dependencies of the overriden crate differ from the released version. This unfortunately means that we'll need to manually specify the overrides in every single one of our crates for development on master. Hopefully we can have a better solution long term, in the mean time this is the only option that will compile. --- .cargo/config | 1 - diesel_compile_tests/Cargo.toml | 5 +++++ diesel_tests/Cargo.toml | 5 +++++ examples/getting_started_step_1/Cargo.toml | 4 ++++ examples/getting_started_step_2/Cargo.toml | 4 ++++ examples/getting_started_step_3/Cargo.toml | 4 ++++ examples/getting_started_step_4/Cargo.toml | 5 +++++ 7 files changed, 27 insertions(+), 1 deletion(-) delete mode 100644 .cargo/config diff --git a/.cargo/config b/.cargo/config deleted file mode 100644 index 0e208191719c..000000000000 --- a/.cargo/config +++ /dev/null @@ -1 +0,0 @@ -paths = ["diesel", "diesel_codegen", "diesel_codegen_syntex"] diff --git a/diesel_compile_tests/Cargo.toml b/diesel_compile_tests/Cargo.toml index 90f82b9edbef..2bdc3cdd0e44 100644 --- a/diesel_compile_tests/Cargo.toml +++ b/diesel_compile_tests/Cargo.toml @@ -7,3 +7,8 @@ authors = ["Sean Griffin "] diesel = { version = "0.7.1", features = ["sqlite", "postgres"] } diesel_codegen = { version = "0.7.2" } compiletest_rs = "0.2.1" + + +[replace] +"diesel:0.7.1" = { path = "../diesel" } +"diesel_codegen:0.7.2" = { path = "../diesel_codegen" } diff --git a/diesel_tests/Cargo.toml b/diesel_tests/Cargo.toml index 785343402770..ea82f878ac96 100644 --- a/diesel_tests/Cargo.toml +++ b/diesel_tests/Cargo.toml @@ -40,3 +40,8 @@ harness = true name = "benchmarks" path = "tests/bench.rs" bench = true + +[replace] +"diesel:0.7.1" = { path = "../diesel" } +"diesel_codegen:0.7.2" = { path = "../diesel_codegen" } +"diesel_codegen_syntex:0.7.2" = { path = "../diesel_codegen_syntex" } diff --git a/examples/getting_started_step_1/Cargo.toml b/examples/getting_started_step_1/Cargo.toml index f4408215a458..ab4351f861a8 100644 --- a/examples/getting_started_step_1/Cargo.toml +++ b/examples/getting_started_step_1/Cargo.toml @@ -7,3 +7,7 @@ authors = ["Sean Griffin "] diesel = "0.7.1" diesel_codegen = { version = "0.7.2", features = ["postgres"] } dotenv = "0.8.0" + +[replace] +"diesel:0.7.1" = { path = "../../diesel" } +"diesel_codegen:0.7.2" = { path = "../../diesel_codegen" } diff --git a/examples/getting_started_step_2/Cargo.toml b/examples/getting_started_step_2/Cargo.toml index f4408215a458..ab4351f861a8 100644 --- a/examples/getting_started_step_2/Cargo.toml +++ b/examples/getting_started_step_2/Cargo.toml @@ -7,3 +7,7 @@ authors = ["Sean Griffin "] diesel = "0.7.1" diesel_codegen = { version = "0.7.2", features = ["postgres"] } dotenv = "0.8.0" + +[replace] +"diesel:0.7.1" = { path = "../../diesel" } +"diesel_codegen:0.7.2" = { path = "../../diesel_codegen" } diff --git a/examples/getting_started_step_3/Cargo.toml b/examples/getting_started_step_3/Cargo.toml index f4408215a458..ab4351f861a8 100644 --- a/examples/getting_started_step_3/Cargo.toml +++ b/examples/getting_started_step_3/Cargo.toml @@ -7,3 +7,7 @@ authors = ["Sean Griffin "] diesel = "0.7.1" diesel_codegen = { version = "0.7.2", features = ["postgres"] } dotenv = "0.8.0" + +[replace] +"diesel:0.7.1" = { path = "../../diesel" } +"diesel_codegen:0.7.2" = { path = "../../diesel_codegen" } diff --git a/examples/getting_started_step_4/Cargo.toml b/examples/getting_started_step_4/Cargo.toml index 3572fb8b4b89..a3ccc4ad5c22 100644 --- a/examples/getting_started_step_4/Cargo.toml +++ b/examples/getting_started_step_4/Cargo.toml @@ -17,3 +17,8 @@ dotenv = "0.8.0" default = ["nightly"] with-syntex = ["syntex", "diesel_codegen_syntex"] nightly = ["diesel/unstable", "diesel_codegen"] + +[replace] +"diesel:0.7.1" = { path = "../../diesel" } +"diesel_codegen:0.7.2" = { path = "../../diesel_codegen" } +"diesel_codegen_syntex:0.7.2" = { path = "../../diesel_codegen_syntex" }