diff --git a/rust/Cargo.lock b/rust/Cargo.lock index d037cfa5e8..e15e439126 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1568,7 +1568,6 @@ dependencies = [ name = "spirv-tools" version = "0.1.0" dependencies = [ - "rspirv", "spirv-tools-core", "spirv-tools-opt", ] diff --git a/rust/Cargo.toml b/rust/Cargo.toml index d10a7af6cb..244a5a7a1e 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -17,6 +17,6 @@ collapsible_if = "allow" manual_is_multiple_of = "allow" derivable_impls = "allow" -[patch.crates-io] +[workspace.dependencies] rspirv = { git = "https://github.com/gfx-rs/rspirv", branch = "sdk-update" } -spirv = { git = "https://github.com/gfx-rs/rspirv", branch = "sdk-update", package = "spirv" } +spirv = { git = "https://github.com/gfx-rs/rspirv", branch = "sdk-update" } diff --git a/rust/spirv-tools-cli/Cargo.toml b/rust/spirv-tools-cli/Cargo.toml index 7722efefdc..c6b4f34f6b 100644 --- a/rust/spirv-tools-cli/Cargo.toml +++ b/rust/spirv-tools-cli/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] clap = { version = "4.5", features = ["derive"] } -rspirv = { version = "0.12.0", default-features = false } +rspirv.workspace = true spirv-tools-core = { path = "../spirv-tools-core" } spirv-tools-ffi = { path = "../spirv-tools-ffi" } thiserror = "1.0" diff --git a/rust/spirv-tools-core/Cargo.toml b/rust/spirv-tools-core/Cargo.toml index ee1d1cd2cf..06079696c1 100644 --- a/rust/spirv-tools-core/Cargo.toml +++ b/rust/spirv-tools-core/Cargo.toml @@ -10,14 +10,14 @@ publish = false [dependencies] bitflags = "2.4" once_cell = "1.19" -rspirv = { version = "0.12.0", default-features = false } +rspirv.workspace = true thiserror = "1.0" libc = "0.2" [build-dependencies] serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -spirv = { version = "0.3.0", default-features = false } +spirv.workspace = true heck = "0.4" [lints] diff --git a/rust/spirv-tools-ffi/Cargo.toml b/rust/spirv-tools-ffi/Cargo.toml index aed2ba4086..53f9f5840a 100644 --- a/rust/spirv-tools-ffi/Cargo.toml +++ b/rust/spirv-tools-ffi/Cargo.toml @@ -14,7 +14,7 @@ crate-type = ["staticlib", "rlib"] cxx = "1" spirv-tools-core = { path = "../spirv-tools-core" } spirv-tools-opt = { path = "../spirv-tools-opt" } -rspirv = "0.12" +rspirv.workspace = true thiserror = "1" arbitrary = { version = "1.3", features = ["derive"] } fastrand = "2.1" diff --git a/rust/spirv-tools-opt/Cargo.toml b/rust/spirv-tools-opt/Cargo.toml index 36d1754ade..140fe22e79 100644 --- a/rust/spirv-tools-opt/Cargo.toml +++ b/rust/spirv-tools-opt/Cargo.toml @@ -11,7 +11,7 @@ egglog = { git = "https://github.com/egraphs-good/egglog.git" } spirv-tools-core = { path = "../spirv-tools-core" } arbitrary = { version = "1.3", features = ["derive"] } thiserror = "1.0" -rspirv = "0.12" +rspirv.workspace = true clap = { version = "4.5", features = ["derive"] } [dev-dependencies] diff --git a/rust/spirv-tools-opt/fuzz/Cargo.toml b/rust/spirv-tools-opt/fuzz/Cargo.toml index 5f0d33e40e..4019f82900 100644 --- a/rust/spirv-tools-opt/fuzz/Cargo.toml +++ b/rust/spirv-tools-opt/fuzz/Cargo.toml @@ -11,7 +11,7 @@ cargo-fuzz = true libfuzzer-sys = "0.4" spirv-tools-opt = { path = ".." } arbitrary = { version = "1", features = ["derive"] } -rspirv = { git = "https://github.com/gfx-rs/rspirv", branch = "sdk-update" } +rspirv.workspace = true [workspace] members = ["."] diff --git a/rust/spirv-tools/Cargo.toml b/rust/spirv-tools/Cargo.toml index d94e7af91a..7c3c35b873 100644 --- a/rust/spirv-tools/Cargo.toml +++ b/rust/spirv-tools/Cargo.toml @@ -8,7 +8,6 @@ license = "Apache-2.0" [dependencies] spirv-tools-core = { path = "../spirv-tools-core" } spirv-tools-opt = { path = "../spirv-tools-opt" } -rspirv = "0.12" [features] default = []