expr::{ExprId, PatId},
generics::GenericParams,
item_scope::{BuiltinShadowMode, BUILTIN_SCOPE},
- nameres::CrateDefMap,
+ nameres::DefMap,
path::{ModPath, PathKind},
per_ns::PerNs,
visibility::{RawVisibility, Visibility},
// FIXME how to store these best
#[derive(Debug, Clone)]
struct ModuleItemMap {
- crate_def_map: Arc<CrateDefMap>,
+ crate_def_map: Arc<DefMap>,
module_id: LocalModuleId,
}
) -> Option<ResolveValueResult> {
let n_segments = path.segments.len();
let tmp = name![self];
- let first_name = if path.is_self() { &tmp } else { &path.segments.first()? };
+ let first_name = if path.is_self() { &tmp } else { path.segments.first()? };
let skip_to_mod = path.kind != PathKind::Plain && !path.is_self();
for scope in self.scopes.iter().rev() {
match scope {
traits
}
- fn module_scope(&self) -> Option<(&CrateDefMap, LocalModuleId)> {
+ fn module_scope(&self) -> Option<(&DefMap, LocalModuleId)> {
self.scopes.iter().rev().find_map(|scope| match scope {
Scope::ModuleScope(m) => Some((&*m.crate_def_map, m.module_id)),
self.push_scope(Scope::ImplDefScope(impl_def))
}
- fn push_module_scope(
- self,
- crate_def_map: Arc<CrateDefMap>,
- module_id: LocalModuleId,
- ) -> Resolver {
+ fn push_module_scope(self, crate_def_map: Arc<DefMap>, module_id: LocalModuleId) -> Resolver {
self.push_scope(Scope::ModuleScope(ModuleItemMap { crate_def_map, module_id }))
}