Skip to content

Commit 7ba4e95

Browse files
committed
Auto merge of rust-lang#107778 - weihanglo:update-cargo, r=weihanglo
Update cargo 12 commits in e84a7928d93a31f284b497c214a2ece69b4d7719..82c3bb79e3a19a5164e33819ef81bfc2c984bc56 2023-01-31 22:18:09 +0000 to 2023-02-04 22:52:16 +0000 - util toml targets: Do not infer directory as a file (rust-lang/cargo#11678) - Add more guidance on how to implement unstable features (rust-lang/cargo#11675) - Fix unstable chapter layout for codegen-backend (rust-lang/cargo#11676) - refactor: mod.rs over "name".rs for consistency (rust-lang/cargo#11673) - Verify source before recompile (rust-lang/cargo#11672) - doc: more doc comments and intra-doc links (rust-lang/cargo#11669) - Turn off debuginfo for build dependencies v2 (rust-lang/cargo#11252) - config: Deny CARGO_HOME in [env] table (fixes rust-lang/cargo#11590) (rust-lang/cargo#11644) - Fix the wrong comment (rust-lang/cargo#11651) - Add partial support for SSH known hosts markers (rust-lang/cargo#11635) - Replace `winapi` with `windows-sys` crate. (rust-lang/cargo#11656) - Handle .cargo-ok being truncated (rust-lang/cargo#11665) r? `@ghost`
2 parents b082e80 + 6f38fd5 commit 7ba4e95

File tree

2 files changed

+49
-25
lines changed

2 files changed

+49
-25
lines changed

Cargo.lock

+48-24
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ dependencies = [
407407
"unicode-xid",
408408
"url",
409409
"walkdir",
410-
"winapi",
410+
"windows-sys 0.45.0",
411411
]
412412

413413
[[package]]
@@ -436,7 +436,7 @@ name = "cargo-credential-wincred"
436436
version = "0.2.0"
437437
dependencies = [
438438
"cargo-credential",
439-
"winapi",
439+
"windows-sys 0.45.0",
440440
]
441441

442442
[[package]]
@@ -496,7 +496,7 @@ dependencies = [
496496
"time 0.3.17",
497497
"toml_edit",
498498
"url",
499-
"winapi",
499+
"windows-sys 0.45.0",
500500
]
501501

502502
[[package]]
@@ -516,7 +516,7 @@ dependencies = [
516516
"shell-escape",
517517
"tempfile",
518518
"walkdir",
519-
"winapi",
519+
"windows-sys 0.45.0",
520520
]
521521

522522
[[package]]
@@ -2217,7 +2217,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
22172217
checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
22182218
dependencies = [
22192219
"libc",
2220-
"windows-sys",
2220+
"windows-sys 0.42.0",
22212221
]
22222222

22232223
[[package]]
@@ -2229,7 +2229,7 @@ dependencies = [
22292229
"hermit-abi 0.2.6",
22302230
"io-lifetimes",
22312231
"rustix",
2232-
"windows-sys",
2232+
"windows-sys 0.42.0",
22332233
]
22342234

22352235
[[package]]
@@ -2670,7 +2670,7 @@ version = "0.5.0"
26702670
source = "registry+https://github.com/rust-lang/crates.io-index"
26712671
checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123"
26722672
dependencies = [
2673-
"windows-sys",
2673+
"windows-sys 0.42.0",
26742674
]
26752675

26762676
[[package]]
@@ -2987,7 +2987,7 @@ dependencies = [
29872987
"libc",
29882988
"redox_syscall",
29892989
"smallvec",
2990-
"windows-sys",
2990+
"windows-sys 0.42.0",
29912991
]
29922992

29932993
[[package]]
@@ -4969,7 +4969,7 @@ dependencies = [
49694969
"io-lifetimes",
49704970
"libc",
49714971
"linux-raw-sys",
4972-
"windows-sys",
4972+
"windows-sys 0.42.0",
49734973
]
49744974

49754975
[[package]]
@@ -5499,7 +5499,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
54995499
checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907"
55005500
dependencies = [
55015501
"rustix",
5502-
"windows-sys",
5502+
"windows-sys 0.42.0",
55035503
]
55045504

55055505
[[package]]
@@ -6251,47 +6251,71 @@ dependencies = [
62516251
"windows_x86_64_msvc",
62526252
]
62536253

6254+
[[package]]
6255+
name = "windows-sys"
6256+
version = "0.45.0"
6257+
source = "registry+https://github.com/rust-lang/crates.io-index"
6258+
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
6259+
dependencies = [
6260+
"windows-targets",
6261+
]
6262+
6263+
[[package]]
6264+
name = "windows-targets"
6265+
version = "0.42.1"
6266+
source = "registry+https://github.com/rust-lang/crates.io-index"
6267+
checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
6268+
dependencies = [
6269+
"windows_aarch64_gnullvm",
6270+
"windows_aarch64_msvc",
6271+
"windows_i686_gnu",
6272+
"windows_i686_msvc",
6273+
"windows_x86_64_gnu",
6274+
"windows_x86_64_gnullvm",
6275+
"windows_x86_64_msvc",
6276+
]
6277+
62546278
[[package]]
62556279
name = "windows_aarch64_gnullvm"
6256-
version = "0.42.0"
6280+
version = "0.42.1"
62576281
source = "registry+https://github.com/rust-lang/crates.io-index"
6258-
checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
6282+
checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
62596283

62606284
[[package]]
62616285
name = "windows_aarch64_msvc"
6262-
version = "0.42.0"
6286+
version = "0.42.1"
62636287
source = "registry+https://github.com/rust-lang/crates.io-index"
6264-
checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
6288+
checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
62656289

62666290
[[package]]
62676291
name = "windows_i686_gnu"
6268-
version = "0.42.0"
6292+
version = "0.42.1"
62696293
source = "registry+https://github.com/rust-lang/crates.io-index"
6270-
checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
6294+
checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
62716295

62726296
[[package]]
62736297
name = "windows_i686_msvc"
6274-
version = "0.42.0"
6298+
version = "0.42.1"
62756299
source = "registry+https://github.com/rust-lang/crates.io-index"
6276-
checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
6300+
checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
62776301

62786302
[[package]]
62796303
name = "windows_x86_64_gnu"
6280-
version = "0.42.0"
6304+
version = "0.42.1"
62816305
source = "registry+https://github.com/rust-lang/crates.io-index"
6282-
checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
6306+
checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
62836307

62846308
[[package]]
62856309
name = "windows_x86_64_gnullvm"
6286-
version = "0.42.0"
6310+
version = "0.42.1"
62876311
source = "registry+https://github.com/rust-lang/crates.io-index"
6288-
checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
6312+
checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
62896313

62906314
[[package]]
62916315
name = "windows_x86_64_msvc"
6292-
version = "0.42.0"
6316+
version = "0.42.1"
62936317
source = "registry+https://github.com/rust-lang/crates.io-index"
6294-
checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
6318+
checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
62956319

62966320
[[package]]
62976321
name = "writeable"

src/tools/cargo

Submodule cargo updated 45 files

0 commit comments

Comments
 (0)