aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-03-27 13:31:38 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-03-27 13:31:38 +0000
commitde56dba452006f6b1c7dc2f2264c77ec2bcf81f8 (patch)
tree7f7338981e169b17aec82d469ba7f5d38d20ac27
parenteeb21dc8cc38a0597fb7949b5c1f42408cd93e35 (diff)
parente8477f326059377a8a7b3489bd7c452d1ea98187 (diff)
Merge #1066
1066: update salsa some more r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r--Cargo.lock12
-rw-r--r--crates/ra_db/Cargo.toml2
2 files changed, 7 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 4e8af93b1..9a5630db6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -944,7 +944,7 @@ dependencies = [
944 "ra_syntax 0.1.0", 944 "ra_syntax 0.1.0",
945 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 945 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
946 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 946 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
947 "salsa 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", 947 "salsa 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
948 "test_utils 0.1.0", 948 "test_utils 0.1.0",
949] 949]
950 950
@@ -1335,7 +1335,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1335 1335
1336[[package]] 1336[[package]]
1337name = "salsa" 1337name = "salsa"
1338version = "0.11.0" 1338version = "0.11.1"
1339source = "registry+https://github.com/rust-lang/crates.io-index" 1339source = "registry+https://github.com/rust-lang/crates.io-index"
1340dependencies = [ 1340dependencies = [
1341 "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", 1341 "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1344,13 +1344,13 @@ dependencies = [
1344 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 1344 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
1345 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 1345 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
1346 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1346 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1347 "salsa-macros 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", 1347 "salsa-macros 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
1348 "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", 1348 "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
1349] 1349]
1350 1350
1351[[package]] 1351[[package]]
1352name = "salsa-macros" 1352name = "salsa-macros"
1353version = "0.11.0" 1353version = "0.11.1"
1354source = "registry+https://github.com/rust-lang/crates.io-index" 1354source = "registry+https://github.com/rust-lang/crates.io-index"
1355dependencies = [ 1355dependencies = [
1356 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", 1356 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1969,8 +1969,8 @@ dependencies = [
1969"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" 1969"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
1970"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" 1970"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
1971"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7" 1971"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
1972"checksum salsa 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "486b65955bed2bd0315c76090877e3102c5ba03e3c897c3da68b2b81797cb703" 1972"checksum salsa 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "94f14bbb013866db2fbeceb97ed82cf35f42020edd39d35268f0b11f89399c79"
1973"checksum salsa-macros 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2902d1ca1b4948a856b78ead01fd997962c4806f0e4ba491c1f385d10225d2d8" 1973"checksum salsa-macros 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1ad27cbae189e9739a96e469d37c6a6deafec36f1282d4fdf4681eae67c9dd39"
1974"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267" 1974"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267"
1975"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" 1975"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
1976"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" 1976"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml
index 2b0380ddf..581cd32fd 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.11.0" 8salsa = "0.11.1"
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"