From 21508cfb2f5452c6f19ab0e615a6c61cb28154c8 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 20 Nov 2018 16:55:35 +0300 Subject: Use OO API instead of resolve_module --- crates/ra_analysis/src/descriptors/module/mod.rs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'crates/ra_analysis/src/descriptors/module') diff --git a/crates/ra_analysis/src/descriptors/module/mod.rs b/crates/ra_analysis/src/descriptors/module/mod.rs index 16faea94e..d0560244a 100644 --- a/crates/ra_analysis/src/descriptors/module/mod.rs +++ b/crates/ra_analysis/src/descriptors/module/mod.rs @@ -165,15 +165,6 @@ enum ModuleSourceNode { #[derive(Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord, Debug)] pub(crate) struct ModuleId(u32); -impl crate::loc2id::NumericId for ModuleId { - fn from_u32(id: u32) -> Self { - ModuleId(id) - } - fn to_u32(self) -> u32 { - self.0 - } -} - #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)] struct LinkId(u32); @@ -189,13 +180,13 @@ pub enum Problem { } impl ModuleId { - pub(crate) fn source(self, tree: &ModuleTree) -> ModuleSource { + fn source(self, tree: &ModuleTree) -> ModuleSource { tree.module(self).source } fn parent_link(self, tree: &ModuleTree) -> Option { tree.module(self).parent } - pub(crate) fn parent(self, tree: &ModuleTree) -> Option { + fn parent(self, tree: &ModuleTree) -> Option { let link = self.parent_link(tree)?; Some(tree.link(link).owner) } -- cgit v1.2.3