diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-10-31 07:55:15 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-10-31 07:55:15 +0000 |
commit | 7973c91281837bbb5c5a0bf3b1c71a5b52654b20 (patch) | |
tree | 8459ba446606dd0920a87de23276a8c5f80fd58a /crates/ra_hir/src/nameres.rs | |
parent | 51092ee72aa87787a65645ccdf82d3cb5a015915 (diff) | |
parent | b20d37cb49536e19f6af57b00258f86eb8f19325 (diff) |
Merge #2140
2140: move builtin types to hir_def r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/nameres.rs')
-rw-r--r-- | crates/ra_hir/src/nameres.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs index 7c4d07de0..7ba031827 100644 --- a/crates/ra_hir/src/nameres.rs +++ b/crates/ra_hir/src/nameres.rs | |||
@@ -54,7 +54,7 @@ mod tests; | |||
54 | 54 | ||
55 | use std::sync::Arc; | 55 | use std::sync::Arc; |
56 | 56 | ||
57 | use hir_def::CrateModuleId; | 57 | use hir_def::{builtin_type::BuiltinType, CrateModuleId}; |
58 | use once_cell::sync::Lazy; | 58 | use once_cell::sync::Lazy; |
59 | use ra_arena::Arena; | 59 | use ra_arena::Arena; |
60 | use ra_db::{Edition, FileId}; | 60 | use ra_db::{Edition, FileId}; |
@@ -68,8 +68,7 @@ use crate::{ | |||
68 | diagnostics::DiagnosticSink, | 68 | diagnostics::DiagnosticSink, |
69 | ids::MacroDefId, | 69 | ids::MacroDefId, |
70 | nameres::diagnostics::DefDiagnostic, | 70 | nameres::diagnostics::DefDiagnostic, |
71 | Adt, AstId, BuiltinType, Crate, HirFileId, MacroDef, Module, ModuleDef, Name, Path, PathKind, | 71 | Adt, AstId, Crate, HirFileId, MacroDef, Module, ModuleDef, Name, Path, PathKind, Trait, |
72 | Trait, | ||
73 | }; | 72 | }; |
74 | 73 | ||
75 | pub use self::per_ns::{Namespace, PerNs}; | 74 | pub use self::per_ns::{Namespace, PerNs}; |