make rspirv dep a workspace git dep instead of a patch

Author: Firestar99

rust/Cargo.lock

@@ -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" }

rust/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"

rust/spirv-tools-cli/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]

rust/spirv-tools-core/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"

rust/spirv-tools-ffi/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]

rust/spirv-tools-opt/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 = ["."]

rust/spirv-tools-opt/fuzz/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 = []