Skip to content

Commit

Permalink
Fix test failures
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
sgrif committed Oct 10, 2016
1 parent 250b445 commit 78080f0
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 1 deletion.
1 change: 0 additions & 1 deletion .cargo/config

This file was deleted.

5 changes: 5 additions & 0 deletions diesel_compile_tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,8 @@ authors = ["Sean Griffin <[email protected]>"]
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" }
5 changes: 5 additions & 0 deletions diesel_tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
4 changes: 4 additions & 0 deletions examples/getting_started_step_1/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ authors = ["Sean Griffin <[email protected]>"]
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" }
4 changes: 4 additions & 0 deletions examples/getting_started_step_2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ authors = ["Sean Griffin <[email protected]>"]
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" }
4 changes: 4 additions & 0 deletions examples/getting_started_step_3/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ authors = ["Sean Griffin <[email protected]>"]
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" }
5 changes: 5 additions & 0 deletions examples/getting_started_step_4/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

0 comments on commit 78080f0

Please sign in to comment.