roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-09-23 00:39:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use if let over some matches

Browse Source
This commit is contained in:
Richard Feldman 2022-07-08 17:59:26 -04:00
parent 9cc658119e
commit 281f2d6842
No known key found for this signature in database
GPG Key ID: 7E4127D1E4241798
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
crates/compiler/load_internal/src/file.rs
View File

@ -1136,40 +1136,32 @@ impl<'a> LoadStart<'a> {
); );
match res_loaded { match res_loaded {
Ok((module_id, msg)) => match &msg { Ok((module_id, msg)) => {
Msg::Header(ModuleHeader { if let Msg::Header(ModuleHeader {
module_id: header_id, module_id: header_id,
module_name, module_name,
module_path,
is_root_module, is_root_module,
.. ..
}) => { }) = &msg
{
debug_assert_eq!(*header_id, module_id); debug_assert_eq!(*header_id, module_id);
debug_assert!(is_root_module); debug_assert!(is_root_module);
match &module_name { if let ModuleNameEnum::Interface(name) = module_name {
ModuleNameEnum::Interface(name) => { // Interface modules can have names like Foo.Bar.Baz,
// Interface modules can have names like Foo.Bar.Baz, // in which case we need to adjust the src_dir to
// in which case we need to adjust the src_dir to // remove the "Bar/Baz" directories in order to correctly
// remove the "Bar/Baz" directories in order to correctly // resolve this interface module's imports!
// resolve this interface module's imports! let dirs_to_pop = name.as_str().matches('.').count();
let dirs_to_pop = name.as_str().matches('.').count();
if dirs_to_pop > 0 { for _ in 0..dirs_to_pop {
for _ in 0..dirs_to_pop { src_dir.pop();
src_dir.pop();
}
(module_id, msg)
} else {
(module_id, msg)
}
} }
_ => (module_id, msg),
} }
} }
_ => (module_id, msg),
}, (module_id, msg)
}
Err(LoadingProblem::ParsingFailed(problem)) => { Err(LoadingProblem::ParsingFailed(problem)) => {
let module_ids = Arc::try_unwrap(arc_modules) let module_ids = Arc::try_unwrap(arc_modules)