aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock16
-rw-r--r--Cargo.toml1
-rw-r--r--crates/ra_db/Cargo.toml2
-rw-r--r--crates/ra_ide_api/src/imp.rs18
4 files changed, 17 insertions, 20 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 2f4fa8dee..628e431bd 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 (git+https://github.com/matklad/salsa?branch=flexible-gc)", 926 "salsa 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
927 "test_utils 0.1.0", 927 "test_utils 0.1.0",
928] 928]
929 929
@@ -1301,8 +1301,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1301 1301
1302[[package]] 1302[[package]]
1303name = "salsa" 1303name = "salsa"
1304version = "0.10.0-alpha5" 1304version = "0.10.0"
1305source = "git+https://github.com/matklad/salsa?branch=flexible-gc#d01d6ed511fc46b6bd8d7bc2de5e5896da008ed0" 1305source = "registry+https://github.com/rust-lang/crates.io-index"
1306dependencies = [ 1306dependencies = [
1307 "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)",
1308 "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)",
@@ -1310,14 +1310,14 @@ dependencies = [
1310 "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)",
1311 "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)",
1312 "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)",
1313 "salsa-macros 0.10.0-alpha5 (git+https://github.com/matklad/salsa?branch=flexible-gc)", 1313 "salsa-macros 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
1314 "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)",
1315] 1315]
1316 1316
1317[[package]] 1317[[package]]
1318name = "salsa-macros" 1318name = "salsa-macros"
1319version = "0.10.0-alpha5" 1319version = "0.10.0"
1320source = "git+https://github.com/matklad/salsa?branch=flexible-gc#d01d6ed511fc46b6bd8d7bc2de5e5896da008ed0" 1320source = "registry+https://github.com/rust-lang/crates.io-index"
1321dependencies = [ 1321dependencies = [
1322 "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)",
1323 "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)",
@@ -1989,8 +1989,8 @@ dependencies = [
1989"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"
1990"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"
1991"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>" 1992"checksum salsa 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cad0e2348e2f80725b2980914a08a00267136c3ecf720896d3f7f08eef51e08f"
1993"checksum salsa-macros 0.10.0-alpha5 (git+https://github.com/matklad/salsa?branch=flexible-gc)" = "<none>" 1993"checksum salsa-macros 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c79744109df21b80aef1367669b0a9e4985bc966e76bf0e9321b222ec0b9fbb"
1994"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"
1995"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"
1996"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 845252053..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/matklad/salsa", branch = "flexible-gc" }
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml
index 3bacd8660..3bae22c74 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 = "0.10.0-alpha5" 8salsa = "0.10.0"
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"
diff --git a/crates/ra_ide_api/src/imp.rs b/crates/ra_ide_api/src/imp.rs
index 4e347e973..31e0f5d6d 100644
--- a/crates/ra_ide_api/src/imp.rs
+++ b/crates/ra_ide_api/src/imp.rs
@@ -96,19 +96,17 @@ impl db::RootDatabase {
96 96
97 let sweep = SweepStrategy::default() 97 let sweep = SweepStrategy::default()
98 .discard_values() 98 .discard_values()
99 .discard_all_revisions(); 99 .sweep_all_revisions();
100 100
101 self.query(ra_db::ParseQuery).sweep(sweep.clone()); 101 self.query(ra_db::ParseQuery).sweep(sweep);
102 102
103 self.query(hir::db::HirParseQuery).sweep(sweep.clone()); 103 self.query(hir::db::HirParseQuery).sweep(sweep);
104 self.query(hir::db::FileItemsQuery).sweep(sweep.clone()); 104 self.query(hir::db::FileItemsQuery).sweep(sweep);
105 self.query(hir::db::FileItemQuery).sweep(sweep.clone()); 105 self.query(hir::db::FileItemQuery).sweep(sweep);
106 106
107 self.query(hir::db::LowerModuleQuery).sweep(sweep.clone()); 107 self.query(hir::db::LowerModuleQuery).sweep(sweep);
108 self.query(hir::db::LowerModuleSourceMapQuery) 108 self.query(hir::db::LowerModuleSourceMapQuery).sweep(sweep);
109 .sweep(sweep.clone()); 109 self.query(hir::db::BodySyntaxMappingQuery).sweep(sweep);
110 self.query(hir::db::BodySyntaxMappingQuery)
111 .sweep(sweep.clone());
112 } 110 }
113} 111}
114 112