Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 04:53:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #9372

Browse source 
9372: intenral: dont export impl details r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2021-06-22 13:54:20 +00:00 committed by GitHub
commit 4e2ec914f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
crates/hir/src/lib.rs
View file

@ -51,7 +51,7 @@ use hir_def::{
LocalEnumVariantId, LocalFieldId, Lookup, ModuleId, StaticId, StructId, TraitId, TypeAliasId, LocalEnumVariantId, LocalFieldId, Lookup, ModuleId, StaticId, StructId, TraitId, TypeAliasId,
TypeParamId, UnionId, TypeParamId, UnionId,
}; };
use hir_expand::{name::name, MacroCallKind, MacroDefKind}; use hir_expand::{name::name, MacroCallKind, MacroDefId, MacroDefKind};
use hir_ty::{ use hir_ty::{
autoderef, autoderef,
consteval::ConstExt, consteval::ConstExt,
@ -106,10 +106,9 @@ pub use {
hir_def::{ hir_def::{
adt::StructKind, adt::StructKind,
attr::{Attr, Attrs, AttrsWithOwner, Documentation}, attr::{Attr, Attrs, AttrsWithOwner, Documentation},
body::scope::ExprScopes,
find_path::PrefixKind, find_path::PrefixKind,
import_map, import_map,
item_scope::ItemInNs, item_scope::ItemInNs, // FIXME: don't re-export ItemInNs, as it uses raw ids.
nameres::ModuleSource, nameres::ModuleSource,
path::{ModPath, PathKind}, path::{ModPath, PathKind},
type_ref::{Mutability, TypeRef}, type_ref::{Mutability, TypeRef},
@ -117,8 +116,7 @@ pub use {
}, },
hir_expand::{ hir_expand::{
name::{known, Name}, name::{known, Name},
ExpandResult, HirFileId, InFile, MacroCallId, MacroCallLoc, /* FIXME */ MacroDefId, ExpandResult, HirFileId, InFile, MacroFile, Origin,
MacroFile, Origin,
}, },
hir_ty::display::HirDisplay, hir_ty::display::HirDisplay,
}; };

4
crates/hir/src/semantics/source_to_def.rs
View file

@ -95,7 +95,7 @@ use hir_def::{
ImplId, LifetimeParamId, ModuleId, StaticId, StructId, TraitId, TypeAliasId, TypeParamId, ImplId, LifetimeParamId, ModuleId, StaticId, StructId, TraitId, TypeAliasId, TypeParamId,
UnionId, VariantId, UnionId, VariantId,
}; };
use hir_expand::{name::AsName, AstId, MacroCallId, MacroDefKind}; use hir_expand::{name::AsName, AstId, MacroCallId, MacroDefId, MacroDefKind};
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use smallvec::SmallVec; use smallvec::SmallVec;
use stdx::impl_from; use stdx::impl_from;
@ -104,7 +104,7 @@ use syntax::{
match_ast, AstNode, SyntaxNode, match_ast, AstNode, SyntaxNode,
}; };
use crate::{db::HirDatabase, InFile, MacroDefId}; use crate::{db::HirDatabase, InFile};
pub(super) type SourceToDefCache = FxHashMap<ChildContainer, DynMap>; pub(super) type SourceToDefCache = FxHashMap<ChildContainer, DynMap>;