language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 06:44:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch 'trunk' into dict

Browse source
This commit is contained in:
Chadtech 2021-01-31 15:46:22 -05:00 • committed by GitHub
commit 69fcbf70ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
77 changed files with 4818 additions and 862 deletions
Download patch file Download diff file Expand all files Collapse all files

22
compiler/module/src/symbol.rs
View file

@ -317,18 +317,20 @@ impl fmt::Debug for ModuleId {
/// 4. throw away short names. stash the module id in the can env under the resolved module name
/// 5. test:
/// Package-qualified module name
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub enum PQModuleName<'a> {
Unqualified(InlinableString),
Qualified(&'a str, InlinableString),
pub enum PackageQualified<'a, T> {
Unqualified(T),
Qualified(&'a str, T),
}
impl<'a> PQModuleName<'a> {
pub fn to_module_name(&self) -> &InlinableString {
/// Package-qualified module name
pub type PQModuleName<'a> = PackageQualified<'a, InlinableString>;
impl<'a, T> PackageQualified<'a, T> {
pub fn as_inner(&self) -> &T {
match self {
PQModuleName::Unqualified(name) => name,
PQModuleName::Qualified(_, name) => name,
PackageQualified::Unqualified(name) => name,
PackageQualified::Qualified(_, name) => name,
}
}
}
@ -364,13 +366,13 @@ impl<'a> PackageModuleIds<'a> {
let by_name: MutMap<InlinableString, ModuleId> = self
.by_name
.into_iter()
.map(|(pqname, module_id)| (pqname.to_module_name().clone(), module_id))
.map(|(pqname, module_id)| (pqname.as_inner().clone(), module_id))
.collect();
let by_id: Vec<InlinableString> = self
.by_id
.into_iter()
.map(|pqname| pqname.to_module_name().clone())
.map(|pqname| pqname.as_inner().clone())
.collect();
ModuleIds { by_name, by_id }