aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-05-30 11:05:09 +0100
committerAleksey Kladov <[email protected]>2019-05-30 11:05:09 +0100
commit54f77ad68dc47ca8d99a12f1467bebe8e5441d7e (patch)
tree01403df68361760d8fe02aaf5142c2b9e10f07a7
parent18ed3517474dbc41586f71b22c72bf083be3dca9 (diff)
switch to upstream salsa
-rw-r--r--Cargo.lock12
-rw-r--r--Cargo.toml1
-rw-r--r--crates/ra_db/Cargo.toml2
3 files changed, 7 insertions, 8 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 9482cba8f..b56586ac1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1058,7 +1058,7 @@ dependencies = [
1058 "ra_syntax 0.1.0", 1058 "ra_syntax 0.1.0",
1059 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1059 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
1060 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1060 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1061 "salsa 0.12.1 (git+https://github.com/salsa-rs/salsa?rev=2485cb6)", 1061 "salsa 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
1062 "test_utils 0.1.0", 1062 "test_utils 0.1.0",
1063] 1063]
1064 1064
@@ -1467,7 +1467,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1467[[package]] 1467[[package]]
1468name = "salsa" 1468name = "salsa"
1469version = "0.12.1" 1469version = "0.12.1"
1470source = "git+https://github.com/salsa-rs/salsa?rev=2485cb6#2485cb69a0d8dc5a8772c547c73ccef182a94be4" 1470source = "registry+https://github.com/rust-lang/crates.io-index"
1471dependencies = [ 1471dependencies = [
1472 "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", 1472 "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
1473 "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", 1473 "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1475,14 +1475,14 @@ dependencies = [
1475 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 1475 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
1476 "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 1476 "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
1477 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1477 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1478 "salsa-macros 0.12.1 (git+https://github.com/salsa-rs/salsa?rev=2485cb6)", 1478 "salsa-macros 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
1479 "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", 1479 "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
1480] 1480]
1481 1481
1482[[package]] 1482[[package]]
1483name = "salsa-macros" 1483name = "salsa-macros"
1484version = "0.12.1" 1484version = "0.12.1"
1485source = "git+https://github.com/salsa-rs/salsa?rev=2485cb6#2485cb69a0d8dc5a8772c547c73ccef182a94be4" 1485source = "registry+https://github.com/rust-lang/crates.io-index"
1486dependencies = [ 1486dependencies = [
1487 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", 1487 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
1488 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", 1488 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2124,8 +2124,8 @@ dependencies = [
2124"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" 2124"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
2125"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" 2125"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
2126"checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f" 2126"checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f"
2127"checksum salsa 0.12.1 (git+https://github.com/salsa-rs/salsa?rev=2485cb6)" = "<none>" 2127"checksum salsa 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6ccd6297ee190727cea6f8c81771b73a79bbfc6e320496775083c44dbff67263"
2128"checksum salsa-macros 0.12.1 (git+https://github.com/salsa-rs/salsa?rev=2485cb6)" = "<none>" 2128"checksum salsa-macros 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7f1e25ca2b995bdf032946174929d62156ffd57abd7ff88dc6f9bdeb5ac0c59"
2129"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267" 2129"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267"
2130"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" 2130"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
2131"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" 2131"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
diff --git a/Cargo.toml b/Cargo.toml
index 3fc55fa90..c5155e899 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,4 +6,3 @@ incremental = true
6debug = true 6debug = true
7 7
8[patch.'crates-io'] 8[patch.'crates-io']
9salsa = {git = "https://github.com/salsa-rs/salsa", rev = "2485cb6" } # https://github.com/salsa-rs/salsa/pull/167
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml
index b43202890..827855b2f 100644
--- a/crates/ra_db/Cargo.toml
+++ b/crates/ra_db/Cargo.toml
@@ -5,7 +5,7 @@ version = "0.1.0"
5authors = ["rust-analyzer developers"] 5authors = ["rust-analyzer developers"]
6 6
7[dependencies] 7[dependencies]
8salsa = "0.12.0" 8salsa = "0.12.1"
9relative-path = "0.4.0" 9relative-path = "0.4.0"
10rustc-hash = "1.0" 10rustc-hash = "1.0"
11 11