diff --git a/Cargo.lock b/Cargo.lock index 6d5d41f562..3e35db3fc8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1600,7 +1600,18 @@ dependencies = [ [[package]] name = "half" version = "2.4.1" -source = "git+https://github.com/FL33TW00D/half-rs.git?branch=feature/arbitrary#6bc4bea632269b53ccb6666a8508edc25fba9f3e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "half-2" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c36518ae13d88b7cbdc61401256df5d9fc27921ea66353a16660869b47af8864" dependencies = [ "arbitrary", "bytemuck", @@ -2195,7 +2206,7 @@ dependencies = [ "codespan-reporting", "diff", "env_logger", - "half", + "half-2", "hexf-parse", "hlsl-snapshots", "indexmap", @@ -4110,7 +4121,7 @@ dependencies = [ "flume", "getrandom", "glam", - "half", + "half-2", "ktx2", "log", "nanorand", diff --git a/Cargo.toml b/Cargo.toml index 30646379cf..edd9b11b94 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -215,7 +215,6 @@ ndk-sys = "0.5.0" #gpu-alloc = { path = "../gpu-alloc/gpu-alloc" } [patch.crates-io] -half = { git = "https://github.com/FL33TW00D/half-rs.git", branch = "feature/arbitrary" } #glow = { path = "../glow" } #web-sys = { path = "../wasm-bindgen/crates/web-sys" } #js-sys = { path = "../wasm-bindgen/crates/js-sys" } diff --git a/examples/features/Cargo.toml b/examples/features/Cargo.toml index 6bfdc282b4..928f01ae62 100644 --- a/examples/features/Cargo.toml +++ b/examples/features/Cargo.toml @@ -35,7 +35,10 @@ encase = { workspace = true, features = ["glam"] } flume.workspace = true getrandom.workspace = true glam = { workspace = true, features = ["bytemuck"] } -half = { version = "2.1.0", features = ["bytemuck"] } +half = { package = "half-2", version = "2.4.1", features = [ + "arbitrary", + "bytemuck", +] } ktx2.workspace = true log.workspace = true nanorand.workspace = true diff --git a/naga/Cargo.toml b/naga/Cargo.toml index a26461515d..1524d9797a 100644 --- a/naga/Cargo.toml +++ b/naga/Cargo.toml @@ -86,8 +86,12 @@ petgraph = { version = "0.7", optional = true } pp-rs = { version = "0.2.1", optional = true } hexf-parse = { version = "0.2.1", optional = true } unicode-xid = { version = "0.2.6", optional = true } -# TODO: remove `[patch]` entry in workspace `Cargo.toml` for `half` after we upstream `arbitrary` support -half = { version = "2.4.1", features = ["arbitrary", "num-traits"] } +# TODO: Use `half` directly again after is released +# upstream. +half = { package = "half-2", version = "2.4.1", features = [ + "arbitrary", + "num-traits", +] } num-traits = "0.2" [build-dependencies]