diff --git a/Cargo.lock b/Cargo.lock index 4c3db44633..19b52117c9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -254,7 +254,7 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-targets 0.52.6 (registry+https://github.com/rust-lang/crates.io-index)", + "windows-targets 0.52.6", ] [[package]] @@ -1268,7 +1268,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if 1.0.0", - "windows-targets 0.52.6 (registry+https://github.com/rust-lang/crates.io-index)", + "windows-targets 0.52.6", ] [[package]] @@ -1984,7 +1984,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "windows-registry", + "windows-registry 0.2.0", ] [[package]] @@ -2184,7 +2184,7 @@ dependencies = [ "url", "wait-timeout", "walkdir", - "windows-registry", + "windows-registry 0.3.0", "windows-result", "windows-sys 0.59.0", "xz2", @@ -3179,27 +3179,51 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-registry" version = "0.2.0" -source = "git+https://github.com/microsoft/windows-rs.git#0f7466c34e774e547d21c579b58b60168c4ee6bc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ "windows-result", - "windows-strings", - "windows-targets 0.52.6 (git+https://github.com/microsoft/windows-rs.git)", + "windows-strings 0.1.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bafa604f2104cf5ae2cc2db1dee84b7e6a5d11b05f737b60def0ffdc398cbc0a" +dependencies = [ + "windows-result", + "windows-strings 0.2.0", + "windows-targets 0.52.6", ] [[package]] name = "windows-result" version = "0.2.0" -source = "git+https://github.com/microsoft/windows-rs.git#0f7466c34e774e547d21c579b58b60168c4ee6bc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" dependencies = [ - "windows-targets 0.52.6 (git+https://github.com/microsoft/windows-rs.git)", + "windows-targets 0.52.6", ] [[package]] name = "windows-strings" version = "0.1.0" -source = "git+https://github.com/microsoft/windows-rs.git#0f7466c34e774e547d21c579b58b60168c4ee6bc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows-targets 0.52.6 (git+https://github.com/microsoft/windows-rs.git)", + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978d65aedf914c664c510d9de43c8fd85ca745eaff1ed53edf409b479e441663" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -3217,7 +3241,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6 (registry+https://github.com/rust-lang/crates.io-index)", + "windows-targets 0.52.6", ] [[package]] @@ -3226,7 +3250,7 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets 0.52.6 (registry+https://github.com/rust-lang/crates.io-index)", + "windows-targets 0.52.6", ] [[package]] @@ -3250,29 +3274,14 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6 (registry+https://github.com/rust-lang/crates.io-index)", - "windows_aarch64_msvc 0.52.6 (registry+https://github.com/rust-lang/crates.io-index)", - "windows_i686_gnu 0.52.6 (registry+https://github.com/rust-lang/crates.io-index)", - "windows_i686_gnullvm 0.52.6 (registry+https://github.com/rust-lang/crates.io-index)", - "windows_i686_msvc 0.52.6 (registry+https://github.com/rust-lang/crates.io-index)", - "windows_x86_64_gnu 0.52.6 (registry+https://github.com/rust-lang/crates.io-index)", - "windows_x86_64_gnullvm 0.52.6 (registry+https://github.com/rust-lang/crates.io-index)", - "windows_x86_64_msvc 0.52.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "git+https://github.com/microsoft/windows-rs.git#0f7466c34e774e547d21c579b58b60168c4ee6bc" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6 (git+https://github.com/microsoft/windows-rs.git)", - "windows_aarch64_msvc 0.52.6 (git+https://github.com/microsoft/windows-rs.git)", - "windows_i686_gnu 0.52.6 (git+https://github.com/microsoft/windows-rs.git)", - "windows_i686_gnullvm 0.52.6 (git+https://github.com/microsoft/windows-rs.git)", - "windows_i686_msvc 0.52.6 (git+https://github.com/microsoft/windows-rs.git)", - "windows_x86_64_gnu 0.52.6 (git+https://github.com/microsoft/windows-rs.git)", - "windows_x86_64_gnullvm 0.52.6 (git+https://github.com/microsoft/windows-rs.git)", - "windows_x86_64_msvc 0.52.6 (git+https://github.com/microsoft/windows-rs.git)", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -3287,11 +3296,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "git+https://github.com/microsoft/windows-rs.git#0f7466c34e774e547d21c579b58b60168c4ee6bc" - [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -3304,11 +3308,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "git+https://github.com/microsoft/windows-rs.git#0f7466c34e774e547d21c579b58b60168c4ee6bc" - [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -3321,22 +3320,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "git+https://github.com/microsoft/windows-rs.git#0f7466c34e774e547d21c579b58b60168c4ee6bc" - [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "git+https://github.com/microsoft/windows-rs.git#0f7466c34e774e547d21c579b58b60168c4ee6bc" - [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -3349,11 +3338,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "git+https://github.com/microsoft/windows-rs.git#0f7466c34e774e547d21c579b58b60168c4ee6bc" - [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -3366,11 +3350,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "git+https://github.com/microsoft/windows-rs.git#0f7466c34e774e547d21c579b58b60168c4ee6bc" - [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -3383,11 +3362,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "git+https://github.com/microsoft/windows-rs.git#0f7466c34e774e547d21c579b58b60168c4ee6bc" - [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -3400,11 +3374,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "git+https://github.com/microsoft/windows-rs.git#0f7466c34e774e547d21c579b58b60168c4ee6bc" - [[package]] name = "winnow" version = "0.6.18" diff --git a/Cargo.toml b/Cargo.toml index 764ec461a2..9743ed11a7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -95,13 +95,9 @@ zstd = "0.13" [target."cfg(windows)".dependencies] cc = "1" -windows-registry = "0.2.0" +windows-registry = "0.3.0" windows-result = "0.2.0" -[patch.crates-io] -windows-registry = { git = "https://github.com/microsoft/windows-rs.git" } -windows-result = { git = "https://github.com/microsoft/windows-rs.git" } - [target."cfg(windows)".dependencies.windows-sys] features = [ "Win32_Foundation",