lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-04-04 10:30:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: remove unneeded or_else cases

Browse source
This commit is contained in:
Erica Marigold 2023-10-12 04:02:15 -07:00
parent 299a80a2e8
commit 04b43fe44d
No known key found for this signature in database
GPG key ID: 2768CC0C23D245D1
1 changed files with 2 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/cli/utils/files.rs
View file

@ -149,56 +149,9 @@ pub fn discover_script_path_including_lune_dirs(path: &str) -> Result<PathBuf> {
// directories + the home directory for the current user
let res = discover_script_path(format!("lune{MAIN_SEPARATOR}{path}"), false)
.or_else(|_| discover_script_path(format!(".lune{MAIN_SEPARATOR}{path}"), false))
.or_else(|_| {
discover_script_path(
format!("lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.lua"),
false,
)
})
.or_else(|_| {
discover_script_path(
format!(".lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.lua"),
false,
)
})
.or_else(|_| {
discover_script_path(
format!("lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.luau"),
false,
)
})
.or_else(|_| {
discover_script_path(
format!(".lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.luau"),
false,
)
})
.or_else(|_| discover_script_path(format!("lune{MAIN_SEPARATOR}{path}"), true))
.or_else(|_| discover_script_path(format!(".lune{MAIN_SEPARATOR}{path}"), true))
.or_else(|_| {
discover_script_path(
format!("lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.lua"),
true,
)
})
.or_else(|_| {
discover_script_path(
format!(".lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.lua"),
true,
)
})
.or_else(|_| {
discover_script_path(
format!("lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.luau"),
true,
)
})
.or_else(|_| {
discover_script_path(
format!(".lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.luau"),
true,
)
});
.or_else(|_| discover_script_path(format!(".lune{MAIN_SEPARATOR}{path}"), true));
match res {
// NOTE: The first error message is generally more
// descriptive than the ones for the lune subfolders