diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-03 19:15:56 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-03 19:15:56 +0000 |
| commit | 998ed13d09992d1fe24a45cc725c55390d9a5ca7 (patch) | |
| tree | 0b2388011e628c6a1ff6d7cbca0664ba00dfe4f5 /crates/ra_ide_api/src/db.rs | |
| parent | 395965351d467c716f259935557117fe42a8c9f4 (diff) | |
| parent | dbf9820e35cf2d96bd3295e6890e8ef1cb0a060a (diff) | |
Merge #735
735: make HirDatabase object-safe r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide_api/src/db.rs')
| -rw-r--r-- | crates/ra_ide_api/src/db.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/crates/ra_ide_api/src/db.rs b/crates/ra_ide_api/src/db.rs index 3a9089c22..00f4bdfd2 100644 --- a/crates/ra_ide_api/src/db.rs +++ b/crates/ra_ide_api/src/db.rs | |||
| @@ -60,8 +60,6 @@ impl salsa::ParallelDatabase for RootDatabase { | |||
| 60 | } | 60 | } |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | impl CheckCanceled for RootDatabase {} | ||
| 64 | |||
| 65 | impl AsRef<hir::HirInterner> for RootDatabase { | 63 | impl AsRef<hir::HirInterner> for RootDatabase { |
| 66 | fn as_ref(&self) -> &hir::HirInterner { | 64 | fn as_ref(&self) -> &hir::HirInterner { |
| 67 | &self.interner | 65 | &self.interner |