diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-11-24 21:01:33 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-11-24 21:01:33 +0000 |
| commit | 5478aaebfe4d9d2ad7745702932bf40b2cad226b (patch) | |
| tree | f28435190d7f830acb6335da5eeaa83a458b5e2a /crates/hir | |
| parent | e2d8e1120fbf99d40e8b69039b5e25e788365779 (diff) | |
| parent | 9559bce311c3b6b7009b9cd09e52c75497c87035 (diff) | |
Merge #6630
6630: followup to "hir_expand: propagate expansion errors" r=jonas-schievink a=jonas-schievink
https://github.com/rust-analyzer/rust-analyzer/pull/6625
bors r+ :robot:
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/hir')
| -rw-r--r-- | crates/hir/src/db.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir/src/db.rs b/crates/hir/src/db.rs index 07333c453..8c767b249 100644 --- a/crates/hir/src/db.rs +++ b/crates/hir/src/db.rs | |||
| @@ -11,7 +11,7 @@ pub use hir_def::db::{ | |||
| 11 | }; | 11 | }; |
| 12 | pub use hir_expand::db::{ | 12 | pub use hir_expand::db::{ |
| 13 | AstDatabase, AstDatabaseStorage, AstIdMapQuery, InternEagerExpansionQuery, InternMacroQuery, | 13 | AstDatabase, AstDatabaseStorage, AstIdMapQuery, InternEagerExpansionQuery, InternMacroQuery, |
| 14 | MacroArgTextQuery, MacroDefQuery, MacroExpandQuery, ParseMacroQuery, | 14 | MacroArgTextQuery, MacroDefQuery, MacroExpandQuery, ParseMacroExpansionQuery, |
| 15 | }; | 15 | }; |
| 16 | pub use hir_ty::db::*; | 16 | pub use hir_ty::db::*; |
| 17 | 17 | ||