diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-06-16 17:45:30 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-06-16 17:45:30 +0100 |
commit | 924d4d7ca8bce948b8cbb30ef6da17354e48bad3 (patch) | |
tree | 022742121ea273b6e90f6fbfa342660f46e9f68e /crates/ra_ide_api/src | |
parent | b81caed43f1886024ededad41a1baa8a03f1d2f4 (diff) | |
parent | 6314e62cfb06ea7bbe5f530f2824010be0ffa4c7 (diff) |
Merge #1411
1411: add analysis-bench to benchmark incremental analysis r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide_api/src')
-rw-r--r-- | crates/ra_ide_api/src/lib.rs | 2 | ||||
-rw-r--r-- | crates/ra_ide_api/src/line_index.rs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs index a68c5e2a5..e61d5627e 100644 --- a/crates/ra_ide_api/src/lib.rs +++ b/crates/ra_ide_api/src/lib.rs | |||
@@ -276,7 +276,7 @@ impl AnalysisHost { | |||
276 | pub fn collect_garbage(&mut self) { | 276 | pub fn collect_garbage(&mut self) { |
277 | self.db.collect_garbage(); | 277 | self.db.collect_garbage(); |
278 | } | 278 | } |
279 | pub fn raw_database(&self) -> &impl hir::db::HirDatabase { | 279 | pub fn raw_database(&self) -> &(impl hir::db::HirDatabase + salsa::Database) { |
280 | &self.db | 280 | &self.db |
281 | } | 281 | } |
282 | } | 282 | } |
diff --git a/crates/ra_ide_api/src/line_index.rs b/crates/ra_ide_api/src/line_index.rs index 087dfafed..a53cf9ee0 100644 --- a/crates/ra_ide_api/src/line_index.rs +++ b/crates/ra_ide_api/src/line_index.rs | |||
@@ -10,7 +10,9 @@ pub struct LineIndex { | |||
10 | 10 | ||
11 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] | 11 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] |
12 | pub struct LineCol { | 12 | pub struct LineCol { |
13 | /// Zero-based | ||
13 | pub line: u32, | 14 | pub line: u32, |
15 | /// Zero-based | ||
14 | pub col_utf16: u32, | 16 | pub col_utf16: u32, |
15 | } | 17 | } |
16 | 18 | ||