Cyclic0007/ewwii
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix merge conflicts

Browse Source
This commit is contained in:
Byson94
2025-10-27 18:10:51 +05:30
parent abafe1b6fd 5e827a73c8
commit 2ed91786a3
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/rhai_impl/src/helper.rs
View File

@@ -70,7 +70,6 @@ fn extract_import_paths(code: &str) -> Result<Vec<String>> {
let trimmed = line.trim_start();
if trimmed.starts_with("import ") {
// Example: import "widgets/foo" as _foo;
if let Some(start) = trimmed.find('"') {
if let Some(end_rel) = trimmed[start + 1..].find('"') {
let end = start + 1 + end_rel;
@@ -87,17 +86,10 @@ fn extract_import_paths(code: &str) -> Result<Vec<String>> {
/// Resolve relative and absolute import paths.
fn resolve_import_path(import_path: &str) -> Result<PathBuf> {
let path = Path::new(import_path);
let abs = if path.is_absolute() {
path.to_path_buf()
} else {
std::env::current_dir()?.join(path)
};
let abs =
if path.is_absolute() { path.to_path_buf() } else { std::env::current_dir()?.join(path) };
let abs = if abs.extension().is_none() {
abs.with_extension("rhai")
} else {
abs
};
let abs = if abs.extension().is_none() { abs.with_extension("rhai") } else { abs };
Ok(abs)
}