diff --git a/Cargo.lock b/Cargo.lock index dacc36c..7a40b07 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -757,28 +757,6 @@ version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" -[[package]] -name = "merge" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10bbef93abb1da61525bbc45eeaff6473a41907d19f8f9aa5168d214e10693e9" -dependencies = [ - "merge_derive", - "num-traits", -] - -[[package]] -name = "merge_derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209d075476da2e63b4b29e72a2ef627b840589588e71400a25e3565c4f849d07" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -1337,6 +1315,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn_util" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6754c4559b79657554e9d8a0d56e65e490c76d382b9c23108364ec4125dea23c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "synstructure" version = "0.12.6" @@ -1427,7 +1416,8 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "vbsp" version = "0.5.0" -source = "git+https://github.com/icewind1991/vbsp?rev=b4e08b6e657357f2d0412617cf27a3e92f413dc0#b4e08b6e657357f2d0412617cf27a3e92f413dc0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9267540dab0c93bb5201c40ba3b2d027e2717bf355a8f9bf25377b06a5b32f6" dependencies = [ "ahash", "arrayvec", @@ -1447,13 +1437,13 @@ dependencies = [ [[package]] name = "vbsp-derive" version = "0.1.0" -source = "git+https://github.com/icewind1991/vbsp?rev=b4e08b6e657357f2d0412617cf27a3e92f413dc0#b4e08b6e657357f2d0412617cf27a3e92f413dc0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ade687fadf34b1b7502387fc9eb7b4032ddc9b93022d31356e9984c957abaad" dependencies = [ - "merge", "proc-macro2", "quote", - "structmeta", - "syn 2.0.48", + "syn 1.0.109", + "syn_util", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 9ee8060..ac8b0c1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ rbx_binary = "0.7.1" rbx_dom_weak = "2.5.0" rbx_reflection_database = "0.2.7" rbx_xml = "0.13.1" -vbsp = { git="https://github.com/icewind1991/vbsp", rev = "b4e08b6e657357f2d0412617cf27a3e92f413dc0" } +vbsp = "0.5.0" vpk = "0.2.0" vtf = { path = "../vtf-rs"}