aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock14
-rw-r--r--Cargo.toml1
-rw-r--r--crates/ra_db/Cargo.toml2
3 files changed, 11 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock
index c8d29e3b7..2f4fa8dee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -923,7 +923,7 @@ dependencies = [
923 "ra_syntax 0.1.0", 923 "ra_syntax 0.1.0",
924 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 924 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
925 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 925 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
926 "salsa 0.10.0-alpha5", 926 "salsa 0.10.0-alpha5 (git+https://github.com/matklad/salsa?branch=flexible-gc)",
927 "test_utils 0.1.0", 927 "test_utils 0.1.0",
928] 928]
929 929
@@ -1096,7 +1096,7 @@ version = "0.1.1"
1096source = "registry+https://github.com/rust-lang/crates.io-index" 1096source = "registry+https://github.com/rust-lang/crates.io-index"
1097dependencies = [ 1097dependencies = [
1098 "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", 1098 "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
1099 "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", 1099 "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
1100] 1100]
1101 1101
1102[[package]] 1102[[package]]
@@ -1125,7 +1125,7 @@ name = "rand_hc"
1125version = "0.1.0" 1125version = "0.1.0"
1126source = "registry+https://github.com/rust-lang/crates.io-index" 1126source = "registry+https://github.com/rust-lang/crates.io-index"
1127dependencies = [ 1127dependencies = [
1128 "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", 1128 "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
1129] 1129]
1130 1130
1131[[package]] 1131[[package]]
@@ -1163,7 +1163,7 @@ name = "rand_xorshift"
1163version = "0.1.1" 1163version = "0.1.1"
1164source = "registry+https://github.com/rust-lang/crates.io-index" 1164source = "registry+https://github.com/rust-lang/crates.io-index"
1165dependencies = [ 1165dependencies = [
1166 "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", 1166 "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
1167] 1167]
1168 1168
1169[[package]] 1169[[package]]
@@ -1302,6 +1302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1302[[package]] 1302[[package]]
1303name = "salsa" 1303name = "salsa"
1304version = "0.10.0-alpha5" 1304version = "0.10.0-alpha5"
1305source = "git+https://github.com/matklad/salsa?branch=flexible-gc#d01d6ed511fc46b6bd8d7bc2de5e5896da008ed0"
1305dependencies = [ 1306dependencies = [
1306 "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", 1307 "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
1307 "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", 1308 "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1309,13 +1310,14 @@ dependencies = [
1309 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 1310 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
1310 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 1311 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
1311 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1312 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1312 "salsa-macros 0.10.0-alpha5", 1313 "salsa-macros 0.10.0-alpha5 (git+https://github.com/matklad/salsa?branch=flexible-gc)",
1313 "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", 1314 "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
1314] 1315]
1315 1316
1316[[package]] 1317[[package]]
1317name = "salsa-macros" 1318name = "salsa-macros"
1318version = "0.10.0-alpha5" 1319version = "0.10.0-alpha5"
1320source = "git+https://github.com/matklad/salsa?branch=flexible-gc#d01d6ed511fc46b6bd8d7bc2de5e5896da008ed0"
1319dependencies = [ 1321dependencies = [
1320 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", 1322 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
1321 "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", 1323 "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1987,6 +1989,8 @@ dependencies = [
1987"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" 1989"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
1988"checksum rusty-fork 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9591f190d2852720b679c21f66ad929f9f1d7bb09d1193c26167586029d8489c" 1990"checksum rusty-fork 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9591f190d2852720b679c21f66ad929f9f1d7bb09d1193c26167586029d8489c"
1989"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7" 1991"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
1992"checksum salsa 0.10.0-alpha5 (git+https://github.com/matklad/salsa?branch=flexible-gc)" = "<none>"
1993"checksum salsa-macros 0.10.0-alpha5 (git+https://github.com/matklad/salsa?branch=flexible-gc)" = "<none>"
1990"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267" 1994"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267"
1991"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" 1995"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
1992"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" 1996"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
diff --git a/Cargo.toml b/Cargo.toml
index c5155e899..845252053 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,3 +6,4 @@ incremental = true
6debug = true 6debug = true
7 7
8[patch.'crates-io'] 8[patch.'crates-io']
9salsa = { git = "https://github.com/matklad/salsa", branch = "flexible-gc" }
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml
index e479b38a0..3bacd8660 100644
--- a/crates/ra_db/Cargo.toml
+++ b/crates/ra_db/Cargo.toml
@@ -5,7 +5,7 @@ version = "0.1.0"
5authors = ["Aleksey Kladov <[email protected]>"] 5authors = ["Aleksey Kladov <[email protected]>"]
6 6
7[dependencies] 7[dependencies]
8salsa = { path = "/home/matklad/projects/salsa" } 8salsa = "0.10.0-alpha5"
9relative-path = "0.4.0" 9relative-path = "0.4.0"
10rustc-hash = "1.0" 10rustc-hash = "1.0"
11parking_lot = "0.7.0" 11parking_lot = "0.7.0"