diff options
| author | Seivan Heidari <[email protected]> | 2019-11-28 07:19:14 +0000 |
|---|---|---|
| committer | Seivan Heidari <[email protected]> | 2019-11-28 07:19:14 +0000 |
| commit | 18a0937585b836ec5ed054b9ae48e0156ab6d9ef (patch) | |
| tree | 9de2c0267ddcc00df717f90034d0843d751a851b /crates/ra_db | |
| parent | a7394b44c870f585eacfeb3036a33471aff49ff8 (diff) | |
| parent | 484acc8a61d599662ed63a4cbda091d38a982551 (diff) | |
Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes
Diffstat (limited to 'crates/ra_db')
| -rw-r--r-- | crates/ra_db/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/ra_db/src/lib.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml index 4ec09b6d9..7afa5d8fc 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 = "0.13.0" | 11 | salsa = "0.14.1" |
| 12 | relative-path = "1.0.0" | 12 | relative-path = "1.0.0" |
| 13 | rustc-hash = "1.0" | 13 | rustc-hash = "1.0" |
| 14 | 14 | ||
diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs index e8852531b..21341b769 100644 --- a/crates/ra_db/src/lib.rs +++ b/crates/ra_db/src/lib.rs | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | //! ra_db defines basic database traits. The concrete DB is defined by ra_ide_api. | 1 | //! ra_db defines basic database traits. The concrete DB is defined by ra_ide. |
| 2 | mod cancellation; | 2 | mod cancellation; |
| 3 | mod input; | 3 | mod input; |
| 4 | pub mod fixture; | 4 | pub mod fixture; |