Skip to content

Commit ce5350c

Browse files
Firestar99Firestar99
committed
workspace: turn most dependencies into workspace deps, no actual changes
1 parent 8a192bf commit ce5350c

File tree

12 files changed

+57
-56
lines changed

12 files changed

+57
-56
lines changed

‎Cargo.toml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,18 @@ resolver = "2"
3131

3232
[workspace.dependencies]
3333
# Local dependencies
34-
dyn-any = { path = "libraries/dyn-any", features = ["derive", "glam", "reqwest"] }
35-
graphene-core = { path = "node-graph/gcore" }
36-
graph-craft = { path = "node-graph/graph-craft", features = ["serde"] }
37-
wgpu-executor = { path = "node-graph/wgpu-executor" }
3834
bezier-rs = { path = "libraries/bezier-rs", features = ["dyn-any"] }
39-
path-bool = { path = "libraries/path-bool", default-features = false }
35+
dyn-any = { path = "libraries/dyn-any", features = ["derive", "glam", "reqwest"] }
4036
math-parser = { path = "libraries/math-parser" }
37+
rawkit = { path = "libraries/rawkit" }
38+
path-bool = { path = "libraries/path-bool" }
39+
graphene-core = { path = "node-graph/gcore", default-features = false }
40+
graph-craft = { path = "node-graph/graph-craft", features = ["serde"] }
41+
graphene-std = { path = "node-graph/gstd" }
42+
interpreted-executor = { path = "node-graph/interpreted-executor" }
4143
node-macro = { path = "node-graph/node-macro" }
44+
wgpu-executor = { path = "node-graph/wgpu-executor" }
45+
graphite-proc-macros = { path = "proc-macros" }
4246

4347
# Workspace dependencies
4448
rustc-hash = "2.0"
@@ -76,7 +80,7 @@ resvg = "0.44"
7680
usvg = "0.44"
7781
rand = { version = "0.9", default-features = false }
7882
rand_chacha = "0.9"
79-
glam = { version = "0.29", default-features = false, features = ["serde"] }
83+
glam = { version = "0.29", default-features = false, features = ["serde", "scalar-math"] }
8084
base64 = "0.22"
8185
image = { version = "0.25", default-features = false, features = ["png", "jpeg", "bmp"] }
8286
rustybuzz = "0.20"
@@ -98,6 +102,10 @@ kurbo = { version = "0.11.0", features = ["serde"] }
98102
petgraph = { version = "0.7.1", default-features = false, features = [
99103
"graphmap",
100104
] }
105+
half = { version = "2.4.1", default-features = false, features = ["bytemuck"] }
106+
tinyvec = { version = "1" }
107+
criterion = { version = "0.5", features = ["html_reports"] }
108+
iai-callgrind = { version = "0.12.3" }
101109

102110
[profile.dev]
103111
opt-level = 1

‎editor/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ ron = ["dep:ron"]
2525

2626
[dependencies]
2727
# Local dependencies
28-
graphite-proc-macros = { path = "../proc-macros" }
29-
graph-craft = { path = "../node-graph/graph-craft" }
30-
interpreted-executor = { path = "../node-graph/interpreted-executor", features = [
28+
graphite-proc-macros = { workspace = true }
29+
graph-craft = { workspace = true }
30+
interpreted-executor = { workspace = true, features = [
3131
"serde",
3232
] }
33-
graphene-std = { path = "../node-graph/gstd", features = ["serde"] }
33+
graphene-std = { workspace = true, features = ["serde"] }
3434

3535
# Workspace dependencies
3636
js-sys = { workspace = true }
@@ -64,7 +64,7 @@ web-sys = { workspace = true, features = [
6464
spin = "0.9.8"
6565

6666
# Optional local dependencies
67-
wgpu-executor = { path = "../node-graph/wgpu-executor", optional = true }
67+
wgpu-executor = { workspace = true, optional = true }
6868

6969
# Optional workspace dependencies
7070
wasm-bindgen = { workspace = true, optional = true }

‎frontend/wasm/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ editor = { path = "../../editor", package = "graphite-editor", features = [
2929
# Workspace dependencies
3030
graph-craft = { workspace = true }
3131
log = { workspace = true }
32-
graphene-core = { workspace = true }
32+
graphene-core = { workspace = true, features = ["wasm"] }
3333
serde = { workspace = true, features = ["derive"] }
3434
wasm-bindgen = { workspace = true }
3535
serde-wasm-bindgen = { workspace = true }

‎libraries/math-parser/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ lazy_static = "1.5"
1515
num-complex = "0.4"
1616

1717
[dev-dependencies]
18-
criterion = "0.5"
18+
criterion = { workspace = true }
1919

2020
[[bench]]
2121
name = "bench"

‎libraries/path-bool/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ resvg = "0.44"
3535
image = "0.25"
3636

3737
# Required dependencies
38-
criterion = { version = "0.5", features = ["html_reports"] }
38+
criterion = { workspace = true }
3939

4040
# Benchmarks
4141
[[bench]]

‎node-graph/gcore/Cargo.toml‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,33 +24,29 @@ serde = [
2424
]
2525

2626
[dependencies]
27+
# Local dependencies
28+
math-parser = { workspace = true }
29+
2730
# Workspace dependencies
28-
bytemuck = { workspace = true, features = ["derive"] }
31+
bytemuck = { workspace = true }
2932
node-macro = { workspace = true }
3033
num-derive = { workspace = true }
31-
num-traits = { workspace = true, default-features = false, features = ["i128"] }
34+
num-traits = { workspace = true }
3235
usvg = { workspace = true }
3336
rand = { workspace = true, default-features = false, features = ["std_rng"] }
34-
glam = { workspace = true, default-features = false, features = [
35-
"scalar-math",
36-
] }
37+
glam = { workspace = true }
3738
serde_json = { workspace = true }
38-
petgraph = { workspace = true, default-features = false, features = [
39-
"graphmap",
40-
] }
39+
petgraph = { workspace = true }
4140
rustc-hash = { workspace = true }
42-
math-parser = { path = "../../libraries/math-parser" }
4341
dyn-any = { workspace = true }
4442
ctor = { workspace = true }
4543
rand_chacha = { workspace = true }
4644
bezier-rs = { workspace = true }
4745
specta = { workspace = true }
4846
rustybuzz = { workspace = true }
4947
image = { workspace = true }
50-
51-
# Required dependencies
52-
half = { version = "2.4.1", default-features = false, features = ["bytemuck"] }
53-
tinyvec = { version = "1" }
48+
half = { workspace = true }
49+
tinyvec = { workspace = true }
5450
kurbo = { workspace = true }
5551
log = { workspace = true }
5652

‎node-graph/graph-craft/Cargo.toml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,23 @@ loading = ["serde_json", "serde"]
1515

1616
[dependencies]
1717
# Local dependencies
18-
dyn-any = { path = "../../libraries/dyn-any", features = [
18+
dyn-any = { workspace = true, features = [
1919
"log-bad-types",
2020
"rc",
21-
"glam",
2221
] }
22+
graphene-core = { workspace = true }
2323

2424
# Workspace dependencies
25-
graphene-core = { workspace = true }
2625
log = { workspace = true }
2726
glam = { workspace = true }
2827
bezier-rs = { workspace = true }
2928
specta = { workspace = true }
3029
rustc-hash = { workspace = true }
3130
url = { workspace = true }
3231
reqwest = { workspace = true }
33-
wgpu-executor = { workspace = true, optional = true }
3432

3533
# Optional workspace dependencies
34+
wgpu-executor = { workspace = true, optional = true }
3635
serde = { workspace = true, optional = true }
3736
tokio = { workspace = true, optional = true }
3837
serde_json = { workspace = true, optional = true }
@@ -53,10 +52,8 @@ winit = { workspace = true }
5352
# Workspace dependencies
5453
graph-craft = { workspace = true, features = ["loading"] }
5554
pretty_assertions = { workspace = true }
56-
57-
# Required dependencies
58-
criterion = { version = "0.5", features = ["html_reports"] }
59-
iai-callgrind = { version = "0.12.3" }
55+
criterion = { workspace = true }
56+
iai-callgrind = { workspace = true }
6057

6158
# Benchmarks
6259
[[bench]]

‎node-graph/graphene-cli/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ gpu = [
2020

2121
[dependencies]
2222
# Local dependencies
23-
graphene-std = { path = "../gstd", features = ["serde"] }
24-
interpreted-executor = { path = "../interpreted-executor" }
23+
graphene-core = { workspace = true }
24+
graphene-std = { workspace = true, features = ["serde"] }
25+
interpreted-executor = { workspace = true }
26+
graph-craft = { workspace = true, features = ["loading"] }
2527

2628
# Workspace dependencies
2729
log = { workspace = true }
28-
graph-craft = { workspace = true, features = ["loading"] }
29-
graphene-core = { workspace = true }
3030
futures = { workspace = true }
3131
fern = { workspace = true }
3232
chrono = { workspace = true }

‎node-graph/gstd/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ wayland = ["graph-craft/wayland"]
1919

2020
[dependencies]
2121
# Local dependencies
22-
dyn-any = { path = "../../libraries/dyn-any", features = ["derive", "reqwest"] }
23-
graph-craft = { path = "../graph-craft", features = ["serde"] }
24-
wgpu-executor = { path = "../wgpu-executor" }
25-
graphene-core = { path = "../gcore", default-features = false, features = ["serde"] }
22+
dyn-any = { workspace = true }
23+
graph-craft = { workspace = true, features = ["serde"] }
24+
wgpu-executor = { workspace = true }
25+
graphene-core = { workspace = true, default-features = false, features = ["serde"] }
2626

2727
# Workspace dependencies
2828
fastnoise-lite = { workspace = true }
2929
log = { workspace = true }
3030
bezier-rs = { workspace = true, features = ["serde"] }
31-
path-bool = { workspace = true, features = ["parsing"] }
32-
glam = { workspace = true, features = ["serde"] }
31+
path-bool = { workspace = true }
32+
glam = { workspace = true }
3333
node-macro = { workspace = true }
3434
reqwest = { workspace = true }
3535
futures = { workspace = true }

‎node-graph/interpreted-executor/Cargo.toml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ gpu = ["graphene-std/gpu", "graphene-std/wgpu"]
1111

1212
[dependencies]
1313
# Local dependencies
14-
graphene-std = { path = "../gstd", features = ["serde"] }
15-
graph-craft = { path = "../graph-craft" }
16-
wgpu-executor = { path = "../wgpu-executor" }
17-
18-
# Workspace dependencies
14+
graphene-std = { workspace = true, features = ["serde"] }
15+
graph-craft = { workspace = true }
16+
wgpu-executor = { workspace = true }
1917
graphene-core = { workspace = true }
2018
dyn-any = { workspace = true, features = ["log-bad-types", "glam"] }
19+
20+
# Workspace dependencies
2121
log = { workspace = true }
2222
glam = { workspace = true }
2323
futures = { workspace = true }
@@ -29,9 +29,7 @@ serde = { workspace = true, optional = true }
2929
[dev-dependencies]
3030
# Workspace dependencies
3131
graph-craft = { workspace = true, features = ["loading"] }
32-
33-
# Required dependencies
34-
criterion = { version = "0.5", features = ["html_reports"]}
32+
criterion = { workspace = true }
3533

3634
# Benchmarks
3735
[[bench]]

0 commit comments

Comments
 (0)