Skip to content

Commit 2018054

Browse files
committed
Auto merge of rust-lang#2762 - RalfJung:rustup, r=RalfJung
Rustup
2 parents 59d3572 + e0df042 commit 2018054

File tree

703 files changed

+10309
-5412
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

703 files changed

+10309
-5412
lines changed

.mailmap

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Adrien Tétar <[email protected]>
1515
1616
Alan Egerton <[email protected]>
1717
Alan Stoate <[email protected]>
18+
Albert Larsan <[email protected]> Albert Larsan <[email protected]>
1819
Alessandro Decina <[email protected]>
1920
Alex Burka <[email protected]> Alex Burka <[email protected]>
2021
Alex Hansen <[email protected]>

Cargo.lock

+18-16
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ dependencies = [
351351
"cargo-test-macro",
352352
"cargo-test-support",
353353
"cargo-util",
354-
"clap 4.0.32",
354+
"clap 4.1.1",
355355
"crates-io",
356356
"curl",
357357
"curl-sys",
@@ -551,9 +551,9 @@ version = "0.1.0"
551551

552552
[[package]]
553553
name = "cc"
554-
version = "1.0.76"
554+
version = "1.0.77"
555555
source = "registry+https://github.com/rust-lang/crates.io-index"
556-
checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f"
556+
checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
557557
dependencies = [
558558
"jobserver",
559559
]
@@ -655,12 +655,12 @@ dependencies = [
655655

656656
[[package]]
657657
name = "clap"
658-
version = "4.0.32"
658+
version = "4.1.1"
659659
source = "registry+https://github.com/rust-lang/crates.io-index"
660-
checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39"
660+
checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2"
661661
dependencies = [
662662
"bitflags",
663-
"clap_derive 4.0.21",
663+
"clap_derive 4.1.0",
664664
"clap_lex 0.3.0",
665665
"is-terminal",
666666
"once_cell",
@@ -675,7 +675,7 @@ version = "4.0.7"
675675
source = "registry+https://github.com/rust-lang/crates.io-index"
676676
checksum = "10861370d2ba66b0f5989f83ebf35db6421713fd92351790e7fdd6c36774c56b"
677677
dependencies = [
678-
"clap 4.0.32",
678+
"clap 4.1.1",
679679
]
680680

681681
[[package]]
@@ -693,9 +693,9 @@ dependencies = [
693693

694694
[[package]]
695695
name = "clap_derive"
696-
version = "4.0.21"
696+
version = "4.1.0"
697697
source = "registry+https://github.com/rust-lang/crates.io-index"
698-
checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014"
698+
checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
699699
dependencies = [
700700
"heck",
701701
"proc-macro-error",
@@ -1799,9 +1799,9 @@ dependencies = [
17991799

18001800
[[package]]
18011801
name = "git2"
1802-
version = "0.16.0"
1802+
version = "0.16.1"
18031803
source = "registry+https://github.com/rust-lang/crates.io-index"
1804-
checksum = "be36bc9e0546df253c0cc41fd0af34f5e92845ad8509462ec76672fac6997f5b"
1804+
checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc"
18051805
dependencies = [
18061806
"bitflags",
18071807
"libc",
@@ -2294,7 +2294,7 @@ name = "jsondoclint"
22942294
version = "0.1.0"
22952295
dependencies = [
22962296
"anyhow",
2297-
"clap 4.0.32",
2297+
"clap 4.1.1",
22982298
"fs-err",
22992299
"rustdoc-json-types",
23002300
"serde",
@@ -2365,9 +2365,9 @@ dependencies = [
23652365

23662366
[[package]]
23672367
name = "libgit2-sys"
2368-
version = "0.14.1+1.5.0"
2368+
version = "0.14.2+1.5.1"
23692369
source = "registry+https://github.com/rust-lang/crates.io-index"
2370-
checksum = "4a07fb2692bc3593bda59de45a502bb3071659f2c515e28c71e728306b038e17"
2370+
checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4"
23712371
dependencies = [
23722372
"cc",
23732373
"libc",
@@ -2557,7 +2557,7 @@ dependencies = [
25572557
"ammonia",
25582558
"anyhow",
25592559
"chrono",
2560-
"clap 4.0.32",
2560+
"clap 4.1.1",
25612561
"clap_complete",
25622562
"elasticlunr-rs",
25632563
"env_logger 0.10.0",
@@ -3528,7 +3528,7 @@ dependencies = [
35283528
name = "rustbook"
35293529
version = "0.1.0"
35303530
dependencies = [
3531-
"clap 4.0.32",
3531+
"clap 4.1.1",
35323532
"env_logger 0.7.1",
35333533
"mdbook",
35343534
]
@@ -4783,6 +4783,7 @@ dependencies = [
47834783
"rustc_middle",
47844784
"rustc_parse_format",
47854785
"rustc_query_system",
4786+
"rustc_serialize",
47864787
"rustc_session",
47874788
"rustc_span",
47884789
"rustc_target",
@@ -5607,6 +5608,7 @@ dependencies = [
56075608
"lazy_static",
56085609
"miropt-test-tools",
56095610
"regex",
5611+
"semver",
56105612
"termcolor",
56115613
"walkdir",
56125614
]

0 commit comments

Comments
 (0)