language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 05:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

reduce visibility

Browse source
This commit is contained in:
Aleksey Kladov 2019-03-26 19:15:39 +03:00
parent e28db444df
commit 1325a31e34
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_hir/src/code_model_api.rs
View file

@ -13,7 +13,7 @@ use crate::{
adt::{EnumVariantId, StructFieldId, VariantDef}, adt::{EnumVariantId, StructFieldId, VariantDef},
generics::GenericParams, generics::GenericParams,
docs::{Documentation, Docs, docs_from_ast}, docs::{Documentation, Docs, docs_from_ast},
ids::{FunctionId, StructId, EnumId, AstItemDef, ConstId, StaticId, TraitId, TypeId}, ids::{FunctionId, StructId, EnumId, AstItemDef, ConstId, StaticId, TraitId, TypeAliasId},
impl_block::ImplBlock, impl_block::ImplBlock,
resolve::Resolver, resolve::Resolver,
diagnostics::DiagnosticSink, diagnostics::DiagnosticSink,
@ -672,7 +672,7 @@ impl Docs for Trait {
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct TypeAlias { pub struct TypeAlias {
pub(crate) id: TypeId, pub(crate) id: TypeAliasId,
} }
impl TypeAlias { impl TypeAlias {

20
crates/ra_hir/src/ids.rs
View file

@ -21,7 +21,7 @@ pub struct HirInterner {
consts: LocationInterner<ItemLoc<ast::ConstDef>, ConstId>, consts: LocationInterner<ItemLoc<ast::ConstDef>, ConstId>,
statics: LocationInterner<ItemLoc<ast::StaticDef>, StaticId>, statics: LocationInterner<ItemLoc<ast::StaticDef>, StaticId>,
traits: LocationInterner<ItemLoc<ast::TraitDef>, TraitId>, traits: LocationInterner<ItemLoc<ast::TraitDef>, TraitId>,
types: LocationInterner<ItemLoc<ast::TypeAliasDef>, TypeId>, types: LocationInterner<ItemLoc<ast::TypeAliasDef>, TypeAliasId>,
} }
impl HirInterner { impl HirInterner {
@ -229,7 +229,7 @@ pub(crate) trait AstItemDef<N: AstNode>: ArenaId + Clone {
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct FunctionId(RawId); pub(crate) struct FunctionId(RawId);
impl_arena_id!(FunctionId); impl_arena_id!(FunctionId);
impl AstItemDef<ast::FnDef> for FunctionId { impl AstItemDef<ast::FnDef> for FunctionId {
fn interner(interner: &HirInterner) -> &LocationInterner<ItemLoc<ast::FnDef>, Self> { fn interner(interner: &HirInterner) -> &LocationInterner<ItemLoc<ast::FnDef>, Self> {
@ -238,7 +238,7 @@ impl AstItemDef<ast::FnDef> for FunctionId {
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct StructId(RawId); pub(crate) struct StructId(RawId);
impl_arena_id!(StructId); impl_arena_id!(StructId);
impl AstItemDef<ast::StructDef> for StructId { impl AstItemDef<ast::StructDef> for StructId {
fn interner(interner: &HirInterner) -> &LocationInterner<ItemLoc<ast::StructDef>, Self> { fn interner(interner: &HirInterner) -> &LocationInterner<ItemLoc<ast::StructDef>, Self> {
@ -247,7 +247,7 @@ impl AstItemDef<ast::StructDef> for StructId {
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct EnumId(RawId); pub(crate) struct EnumId(RawId);
impl_arena_id!(EnumId); impl_arena_id!(EnumId);
impl AstItemDef<ast::EnumDef> for EnumId { impl AstItemDef<ast::EnumDef> for EnumId {
fn interner(interner: &HirInterner) -> &LocationInterner<ItemLoc<ast::EnumDef>, Self> { fn interner(interner: &HirInterner) -> &LocationInterner<ItemLoc<ast::EnumDef>, Self> {
@ -256,7 +256,7 @@ impl AstItemDef<ast::EnumDef> for EnumId {
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct ConstId(RawId); pub(crate) struct ConstId(RawId);
impl_arena_id!(ConstId); impl_arena_id!(ConstId);
impl AstItemDef<ast::ConstDef> for ConstId { impl AstItemDef<ast::ConstDef> for ConstId {
fn interner(interner: &HirInterner) -> &LocationInterner<ItemLoc<ast::ConstDef>, Self> { fn interner(interner: &HirInterner) -> &LocationInterner<ItemLoc<ast::ConstDef>, Self> {
@ -265,7 +265,7 @@ impl AstItemDef<ast::ConstDef> for ConstId {
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct StaticId(RawId); pub(crate) struct StaticId(RawId);
impl_arena_id!(StaticId); impl_arena_id!(StaticId);
impl AstItemDef<ast::StaticDef> for StaticId { impl AstItemDef<ast::StaticDef> for StaticId {
fn interner(interner: &HirInterner) -> &LocationInterner<ItemLoc<ast::StaticDef>, Self> { fn interner(interner: &HirInterner) -> &LocationInterner<ItemLoc<ast::StaticDef>, Self> {
@ -274,7 +274,7 @@ impl AstItemDef<ast::StaticDef> for StaticId {
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct TraitId(RawId); pub(crate) struct TraitId(RawId);
impl_arena_id!(TraitId); impl_arena_id!(TraitId);
impl AstItemDef<ast::TraitDef> for TraitId { impl AstItemDef<ast::TraitDef> for TraitId {
fn interner(interner: &HirInterner) -> &LocationInterner<ItemLoc<ast::TraitDef>, Self> { fn interner(interner: &HirInterner) -> &LocationInterner<ItemLoc<ast::TraitDef>, Self> {
@ -283,9 +283,9 @@ impl AstItemDef<ast::TraitDef> for TraitId {
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct TypeId(RawId); pub(crate) struct TypeAliasId(RawId);
impl_arena_id!(TypeId); impl_arena_id!(TypeAliasId);
impl AstItemDef<ast::TypeAliasDef> for TypeId { impl AstItemDef<ast::TypeAliasDef> for TypeAliasId {
fn interner(interner: &HirInterner) -> &LocationInterner<ItemLoc<ast::TypeAliasDef>, Self> { fn interner(interner: &HirInterner) -> &LocationInterner<ItemLoc<ast::TypeAliasDef>, Self> {
&interner.types &interner.types
} }