diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-07 14:51:51 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-07 14:51:51 +0100 |
commit | 43e33f3b4afb018a0bc0666813a4e4dd6568c594 (patch) | |
tree | 402a32a70ad006e0a13ac9d31da2f74a71768cc6 | |
parent | 73e972a173523fd37224c1b6649e0690d2fcdbec (diff) | |
parent | 9effc6116f30ac7aed45d0f19dc58a9c3c3574d7 (diff) |
Merge #5248
5248: Upstream salsa r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r-- | crates/ra_db/Cargo.toml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml index b2d481dfb..ef85266db 100644 --- a/crates/ra_db/Cargo.toml +++ b/crates/ra_db/Cargo.toml | |||
@@ -8,7 +8,7 @@ authors = ["rust-analyzer developers"] | |||
8 | doctest = false | 8 | doctest = false |
9 | 9 | ||
10 | [dependencies] | 10 | [dependencies] |
11 | salsa = { git = "https://github.com/nikomatsakis/salsa", branch = "dynamic-databases-rfc" } | 11 | salsa = "0.15.0" |
12 | relative-path = "1.0.0" | 12 | relative-path = "1.0.0" |
13 | rustc-hash = "1.1.0" | 13 | rustc-hash = "1.1.0" |
14 | 14 | ||