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

Strip

Browse source
This commit is contained in:
uHOOCCOOHu 2019-09-10 01:21:29 +08:00
parent 40f9134159
commit 5f48ef3902
No known key found for this signature in database
GPG key ID: CED392DE0C483D00
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/ra_hir/src/nameres/per_ns.rs
View file

@ -4,7 +4,8 @@ use crate::MacroDef;
pub enum Namespace {
Types,
Values,
Macro,
// Note that only type inference uses this enum, and it doesn't care about macros.
// Macro,
}
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
@ -79,14 +80,7 @@ impl<T> PerNs<T> {
}
}
pub fn and_then<U>(self, f: impl Fn(T) -> Option<U>) -> PerNs<U> {
PerNs {
types: self.types.and_then(&f),
values: self.values.and_then(&f),
macros: self.macros,
}
}
/// Map types and values. Leave macros unchanged.
pub fn map<U>(self, f: impl Fn(T) -> U) -> PerNs<U> {
PerNs { types: self.types.map(&f), values: self.values.map(&f), macros: self.macros }
}

3
crates/ra_hir/src/ty/lower.rs
View file

@ -429,9 +429,6 @@ pub(crate) fn type_for_def(db: &impl HirDatabase, def: TypableDef, ns: Namespace
(TypableDef::Const(_), Namespace::Types) => Ty::Unknown,
(TypableDef::Static(_), Namespace::Types) => Ty::Unknown,
(TypableDef::BuiltinType(_), Namespace::Values) => Ty::Unknown,
// Macro is not typeable
(_, Namespace::Macro) => Ty::Unknown,
}
}