Skip to content

@source globs should apply auto source detection #14814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
RobinMalfait wants to merge 13 commits into from
Closed

@source globs should apply auto source detection #14814

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2b83f94
add failing test
RobinMalfait Oct 28, 2024
14617fd
add globset
RobinMalfait Oct 28, 2024
6914541
split static and dynamic part of glob, then resolve
RobinMalfait Oct 28, 2024
b498238
always log `exec(…)` result when using `test.only` or `test.debug`
RobinMalfait Oct 28, 2024
e6e2996
extend `@source "…";` and `source(…)` tests
RobinMalfait Oct 28, 2024
44d284d
ensure glob entries are sorted
RobinMalfait Oct 28, 2024
7cb9aff
rename `input` to `pattern`
RobinMalfait Oct 28, 2024
5ee6ef6
drop unused code, and update tests with new structure
RobinMalfait Oct 28, 2024
378fb2d
ensure we can compare `GlobEntry` instances
RobinMalfait Oct 28, 2024
67c24cd
ensure the patterns are prepended with the base
RobinMalfait Oct 28, 2024
2e3d032
refactor: move `parent_dir` outside of loop
RobinMalfait Oct 28, 2024
f1db545
ensure glob entry without pattern is scanner correctly
RobinMalfait Oct 28, 2024
b19a0e8
remove dbg statements
RobinMalfait Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: move parent_dir outside of loop
  • Loading branch information
@RobinMalfait
RobinMalfait committed Oct 28, 2024
commit 2e3d032887f1c06e7fe67a436eb04c858ff8606c
15 changes: 7 additions & 8 deletions crates/oxide/tests/scanner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,16 @@ mod scanner {
));
}

let parent_dir = format!(
"{}{}",
fs::canonicalize(&base).unwrap().display(),
path::MAIN_SEPARATOR
);

paths = paths
.into_iter()
.map(|x| {
let parent_dir = format!(
"{}{}",
fs::canonicalize(&base).unwrap().display(),
path::MAIN_SEPARATOR
);
x.replace(&parent_dir, "")
// Normalize paths to use unix style separators
.replace('\\', "/")
x.replace(&parent_dir, "").replace('\\', "/") // Normalize paths to use unix style separators
})
.collect();

Expand Down