language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-30 07:14:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Inline ModuleId::name

Browse source
This commit is contained in:
Richard Feldman 2020-03-29 23:23:13 -04:00
parent 555528c483
commit 4d950f2014
1 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -228,32 +228,11 @@ lazy_static! {
#[derive(Copy, Clone, PartialEq, Eq, Hash)] #[derive(Copy, Clone, PartialEq, Eq, Hash)]
pub struct ModuleId(u32); pub struct ModuleId(u32);
/// In Debug builds only, ModuleId has a name() method that lets
/// you look up its name in a global intern table. This table is
/// behind a mutex, so it is neither populated nor available in release builds.
impl ModuleId { impl ModuleId {
// NOTE: the define_builtins! macro adds a bunch of constants to this impl, // NOTE: the define_builtins! macro adds a bunch of constants to this impl,
// //
// e.g. pub const NUM: ModuleId = … // e.g. pub const NUM: ModuleId = …
#[cfg(debug_assertions)]
pub fn name(self) -> Box<str> {
let names =
DEBUG_MODULE_ID_NAMES
.lock()
.expect("Failed to acquire lock for Debug reading from DEBUG_MODULE_ID_NAMES, presumably because a thread panicked.");
match names.get(&self.0) {
Some(str_ref) => str_ref.clone(),
None => {
panic!(
"Could not find a Debug name for module ID {} in {:?}",
self.0, names,
);
}
}
}
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
pub fn register_debug_idents(self, ident_ids: &IdentIds) { pub fn register_debug_idents(self, ident_ids: &IdentIds) {
let mut all = DEBUG_IDENT_IDS_BY_MODULE_ID.lock().expect("Failed to acquire lock for Debug interning into DEBUG_MODULE_ID_NAMES, presumably because a thread panicked."); let mut all = DEBUG_IDENT_IDS_BY_MODULE_ID.lock().expect("Failed to acquire lock for Debug interning into DEBUG_MODULE_ID_NAMES, presumably because a thread panicked.");
@ -285,7 +264,20 @@ impl fmt::Debug for ModuleId {
// Originally, this printed both name and numeric ID, but the numeric ID // Originally, this printed both name and numeric ID, but the numeric ID
// didn't seem to add anything useful. Feel free to temporarily re-add it // didn't seem to add anything useful. Feel free to temporarily re-add it
// if it's helpful in debugging! // if it's helpful in debugging!
write!(f, "{}", self.name()) let names =
DEBUG_MODULE_ID_NAMES
.lock()
.expect("Failed to acquire lock for Debug reading from DEBUG_MODULE_ID_NAMES, presumably because a thread panicked.");
match names.get(&self.0) {
Some(str_ref) => write!(f, "{}", str_ref.clone()),
None => {
panic!(
"Could not find a Debug name for module ID {} in {:?}",
self.0, names,
);
}
}
} }
/// In relese builds, all we have access to is the number, so only display that. /// In relese builds, all we have access to is the number, so only display that.