From 6c0643f2954bc47ddb3a6a02fc9374fc9dd376ea Mon Sep 17 00:00:00 2001 From: Amaan Qureshi Date: Fri, 16 Feb 2024 22:42:06 -0500 Subject: [PATCH] fix: always push the default files if there's no `externals` --- cli/loader/src/lib.rs | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/cli/loader/src/lib.rs b/cli/loader/src/lib.rs index 3251e4b6..56235ac5 100644 --- a/cli/loader/src/lib.rs +++ b/cli/loader/src/lib.rs @@ -402,19 +402,18 @@ impl Loader { let parser_path = src_path.join("parser.c"); let scanner_path = self.get_scanner_path(src_path); - let paths_to_check = if let Some(external_files) = external_files { - let mut files = if let Some(scanner_path) = scanner_path.as_ref() { - vec![parser_path.clone(), scanner_path.to_path_buf()] - } else { - vec![parser_path.clone()] - }; - for path in external_files { - files.push(src_path.join(path)); - } - files - } else { - Vec::new() - }; + let mut paths_to_check = vec![parser_path.clone()]; + + if let Some(scanner_path) = scanner_path.as_ref() { + paths_to_check.push(scanner_path.to_path_buf()); + } + + paths_to_check.extend( + external_files + .unwrap_or_default() + .iter() + .map(|p| src_path.join(p)), + ); #[cfg(feature = "wasm")] if self.wasm_store.lock().unwrap().is_some() {