Skip to content

Commit bbc9cea

Browse files
Move Filter representation code to it's own crate
This will be required to break a cyclic dependency when the josh-starlark based filter will be added.
1 parent 937c300 commit bbc9cea

17 files changed

Lines changed: 923 additions & 739 deletions

File tree

Cargo.lock

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ members = [
66
"hyper-reverse-proxy",
77
"josh-core",
88
"josh-cli",
9+
"josh-filter",
910
"josh-graphql",
1011
"josh-link",
1112
"josh-proxy",

josh-cli/src/bin/josh-filter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ fn run_filter(args: Vec<String>) -> josh_core::JoshResult<i32> {
192192
let tree_oid = git2::Oid::from_str(specstr.trim()).map_err(|_| {
193193
josh_core::josh_error(&format!("Invalid filter spec or SHA: {}", specstr))
194194
})?;
195-
josh_core::filter::persist::from_tree(&repo, tree_oid)?
195+
josh_core::filter::from_tree(&repo, tree_oid)?
196196
};
197197

198198
if !args.get_flag("no-cache") {

josh-core/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ backtrace = "0.3.76"
1818
bitvec = "1.0.1"
1919
git-version = "0.3.9"
2020
git2 = { workspace = true }
21+
josh-filter = { path = "../josh-filter" }
2122
gix-actor = { workspace = true }
2223
gix-object = { workspace = true }
2324
gix-config = { workspace = true }
@@ -49,4 +50,4 @@ rand = "0.9.2"
4950
criterion2 = { version = "3.0.2" }
5051

5152
[features]
52-
incubating = []
53+
incubating = ["josh-filter/incubating"]

josh-core/src/build.rs

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)