Merge #323

323: workaround salsa/parking-log bug r=matklad a=matklad salsa-rs/salsa#99 Amanieu/parking_lot#101 Co-authored-by: Aleksey Kladov <[email protected]>
rust-lang · Dec 22, 2018 · 8fed875 · 8fed875
2 parents 5a5402d + 724862a
commit 8fed875
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,3 +4,10 @@ members = [ "crates/*" ]
 [profile.release]
 incremental = true
 debug = true
+
+
+[patch.'crates-io']
+# https://github.com/salsa-rs/salsa/pull/75
+# and
+# https://github.com/salsa-rs/salsa/issues/99
+salsa = { git = "https://github.com/matklad/salsa", branch = "no-upgrade" }