Skip to content

Commit 0a9e5e8

Browse files
committed
Auto merge of #2680 - RalfJung:rustup, r=RalfJung
Rustup
2 parents fc105ef + 4da7d4b commit 0a9e5e8

File tree

249 files changed

+6816
-1956
lines changed

Some content is hidden

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

249 files changed

+6816
-1956
lines changed

Cargo.lock

Lines changed: 195 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
211211
dependencies = [
212212
"lazy_static",
213213
"memchr",
214-
"regex-automata",
214+
"regex-automata 0.1.10",
215215
]
216216

217217
[[package]]
@@ -222,7 +222,7 @@ checksum = "fca0852af221f458706eb0725c03e4ed6c46af9ac98e6a689d5e634215d594dd"
222222
dependencies = [
223223
"memchr",
224224
"once_cell",
225-
"regex-automata",
225+
"regex-automata 0.1.10",
226226
"serde",
227227
]
228228

@@ -307,6 +307,7 @@ dependencies = [
307307
"glob",
308308
"hex 0.4.2",
309309
"home",
310+
"http-auth",
310311
"humantime 2.0.1",
311312
"ignore",
312313
"im-rc",
@@ -349,11 +350,11 @@ dependencies = [
349350

350351
[[package]]
351352
name = "cargo-credential"
352-
version = "0.1.0"
353+
version = "0.2.0"
353354

354355
[[package]]
355356
name = "cargo-credential-1password"
356-
version = "0.1.0"
357+
version = "0.2.0"
357358
dependencies = [
358359
"cargo-credential",
359360
"serde",
@@ -362,15 +363,15 @@ dependencies = [
362363

363364
[[package]]
364365
name = "cargo-credential-macos-keychain"
365-
version = "0.1.0"
366+
version = "0.2.0"
366367
dependencies = [
367368
"cargo-credential",
368369
"security-framework",
369370
]
370371

371372
[[package]]
372373
name = "cargo-credential-wincred"
373-
version = "0.1.0"
374+
version = "0.2.0"
374375
dependencies = [
375376
"cargo-credential",
376377
"winapi",
@@ -1692,6 +1693,15 @@ dependencies = [
16921693
"syn",
16931694
]
16941695

1696+
[[package]]
1697+
name = "http-auth"
1698+
version = "0.1.6"
1699+
source = "registry+https://github.com/rust-lang/crates.io-index"
1700+
checksum = "c0b40b39d66c28829a0cf4d09f7e139ff8201f7500a5083732848ed3b4b4d850"
1701+
dependencies = [
1702+
"memchr",
1703+
]
1704+
16951705
[[package]]
16961706
name = "humantime"
16971707
version = "1.3.0"
@@ -1707,6 +1717,73 @@ version = "2.0.1"
17071717
source = "registry+https://github.com/rust-lang/crates.io-index"
17081718
checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a"
17091719

1720+
[[package]]
1721+
name = "icu_list"
1722+
version = "1.0.0"
1723+
source = "registry+https://github.com/rust-lang/crates.io-index"
1724+
checksum = "c40218275f081c4493f190357c5395647b06734c2dc3dcb41cc099a0f60168b1"
1725+
dependencies = [
1726+
"displaydoc",
1727+
"icu_locid",
1728+
"icu_provider",
1729+
"regex-automata 0.2.0",
1730+
"writeable",
1731+
"zerovec",
1732+
]
1733+
1734+
[[package]]
1735+
name = "icu_locid"
1736+
version = "1.0.0"
1737+
source = "registry+https://github.com/rust-lang/crates.io-index"
1738+
checksum = "34b3de5d99a0e275fe6193b9586dbf37364daebc0d39c89b5cf8376a53b789e8"
1739+
dependencies = [
1740+
"displaydoc",
1741+
"litemap",
1742+
"tinystr",
1743+
"writeable",
1744+
"zerovec",
1745+
]
1746+
1747+
[[package]]
1748+
name = "icu_provider"
1749+
version = "1.0.1"
1750+
source = "registry+https://github.com/rust-lang/crates.io-index"
1751+
checksum = "2f911086e3c521a8a824d4f8bfd87769645ced2f07ff913b521c0d793be07100"
1752+
dependencies = [
1753+
"displaydoc",
1754+
"icu_locid",
1755+
"icu_provider_macros",
1756+
"stable_deref_trait",
1757+
"writeable",
1758+
"yoke",
1759+
"zerofrom",
1760+
"zerovec",
1761+
]
1762+
1763+
[[package]]
1764+
name = "icu_provider_adapters"
1765+
version = "1.0.0"
1766+
source = "registry+https://github.com/rust-lang/crates.io-index"
1767+
checksum = "980c71d8a91b246ebbb97847178a4b816eea39d1d550c70ee566384555bb6545"
1768+
dependencies = [
1769+
"icu_locid",
1770+
"icu_provider",
1771+
"tinystr",
1772+
"yoke",
1773+
"zerovec",
1774+
]
1775+
1776+
[[package]]
1777+
name = "icu_provider_macros"
1778+
version = "1.0.0"
1779+
source = "registry+https://github.com/rust-lang/crates.io-index"
1780+
checksum = "38cf6f5b65cf81f0b4298da647101acbfe6ae0e25263f92bd7a22597e9d6d606"
1781+
dependencies = [
1782+
"proc-macro2",
1783+
"quote",
1784+
"syn",
1785+
]
1786+
17101787
[[package]]
17111788
name = "idna"
17121789
version = "0.2.0"
@@ -2034,6 +2111,12 @@ dependencies = [
20342111
"walkdir",
20352112
]
20362113

2114+
[[package]]
2115+
name = "litemap"
2116+
version = "0.6.0"
2117+
source = "registry+https://github.com/rust-lang/crates.io-index"
2118+
checksum = "f34a3f4798fac63fb48cf277eefa38f94d3443baff555bb98e4f56bc9092368e"
2119+
20372120
[[package]]
20382121
name = "lld-wrapper"
20392122
version = "0.1.0"
@@ -2100,7 +2183,7 @@ version = "0.1.0"
21002183
source = "registry+https://github.com/rust-lang/crates.io-index"
21012184
checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
21022185
dependencies = [
2103-
"regex-automata",
2186+
"regex-automata 0.1.10",
21042187
]
21052188

21062189
[[package]]
@@ -2927,6 +3010,15 @@ dependencies = [
29273010
"regex-syntax",
29283011
]
29293012

3013+
[[package]]
3014+
name = "regex-automata"
3015+
version = "0.2.0"
3016+
source = "registry+https://github.com/rust-lang/crates.io-index"
3017+
checksum = "e9368763f5a9b804326f3af749e16f9abf378d227bcdee7634b13d8f17793782"
3018+
dependencies = [
3019+
"memchr",
3020+
]
3021+
29303022
[[package]]
29313023
name = "regex-syntax"
29323024
version = "0.6.26"
@@ -3202,6 +3294,18 @@ dependencies = [
32023294
"rustc_span",
32033295
]
32043296

3297+
[[package]]
3298+
name = "rustc_baked_icu_data"
3299+
version = "0.0.0"
3300+
dependencies = [
3301+
"icu_list",
3302+
"icu_locid",
3303+
"icu_provider",
3304+
"icu_provider_adapters",
3305+
"litemap",
3306+
"zerovec",
3307+
]
3308+
32053309
[[package]]
32063310
name = "rustc_borrowck"
32073311
version = "0.0.0"
@@ -3422,21 +3526,25 @@ version = "0.0.0"
34223526
dependencies = [
34233527
"fluent-bundle",
34243528
"fluent-syntax",
3529+
"icu_list",
3530+
"icu_locid",
3531+
"icu_provider_adapters",
34253532
"intl-memoizer",
3533+
"rustc_baked_icu_data",
34263534
"rustc_data_structures",
34273535
"rustc_macros",
34283536
"rustc_serialize",
34293537
"rustc_span",
34303538
"tracing",
34313539
"unic-langid",
3540+
"writeable",
34323541
]
34333542

34343543
[[package]]
34353544
name = "rustc_errors"
34363545
version = "0.0.0"
34373546
dependencies = [
34383547
"annotate-snippets",
3439-
"atty",
34403548
"rustc_ast",
34413549
"rustc_ast_pretty",
34423550
"rustc_data_structures",
@@ -3476,6 +3584,7 @@ dependencies = [
34763584
"rustc_session",
34773585
"rustc_span",
34783586
"smallvec",
3587+
"thin-vec",
34793588
"tracing",
34803589
]
34813590

@@ -3734,7 +3843,6 @@ dependencies = [
37343843
name = "rustc_log"
37353844
version = "0.0.0"
37363845
dependencies = [
3737-
"atty",
37383846
"rustc_span",
37393847
"tracing",
37403848
"tracing-subscriber",
@@ -3916,6 +4024,7 @@ dependencies = [
39164024
"rustc_macros",
39174025
"rustc_session",
39184026
"rustc_span",
4027+
"thin-vec",
39194028
"tracing",
39204029
"unicode-normalization",
39214030
"unicode-width",
@@ -4045,12 +4154,14 @@ dependencies = [
40454154
"rustc_feature",
40464155
"rustc_hir",
40474156
"rustc_index",
4157+
"rustc_macros",
40484158
"rustc_metadata",
40494159
"rustc_middle",
40504160
"rustc_query_system",
40514161
"rustc_session",
40524162
"rustc_span",
40534163
"smallvec",
4164+
"thin-vec",
40544165
"tracing",
40554166
]
40564167

@@ -4286,7 +4397,6 @@ version = "0.0.0"
42864397
dependencies = [
42874398
"arrayvec",
42884399
"askama",
4289-
"atty",
42904400
"expect-test",
42914401
"itertools",
42924402
"minifier",
@@ -4931,6 +5041,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
49315041
checksum = "f8aeafdfd935e4a7fe16a91ab711fa52d54df84f9c8f7ca5837a9d1d902ef4c2"
49325042
dependencies = [
49335043
"displaydoc",
5044+
"zerovec",
49345045
]
49355046

49365047
[[package]]
@@ -5543,6 +5654,12 @@ version = "0.42.0"
55435654
source = "registry+https://github.com/rust-lang/crates.io-index"
55445655
checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
55455656

5657+
[[package]]
5658+
name = "writeable"
5659+
version = "0.5.0"
5660+
source = "registry+https://github.com/rust-lang/crates.io-index"
5661+
checksum = "f8e6ab4f5da1b24daf2c590cfac801bacb27b15b4f050e84eb60149ea726f06b"
5662+
55465663
[[package]]
55475664
name = "xattr"
55485665
version = "0.2.2"
@@ -5595,3 +5712,71 @@ checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
55955712
dependencies = [
55965713
"winapi",
55975714
]
5715+
5716+
[[package]]
5717+
name = "yoke"
5718+
version = "0.6.2"
5719+
source = "registry+https://github.com/rust-lang/crates.io-index"
5720+
checksum = "1fe1d55ca72c32d573bfbd5cb2f0ca65a497854c44762957a6d3da96041a5184"
5721+
dependencies = [
5722+
"serde",
5723+
"stable_deref_trait",
5724+
"yoke-derive",
5725+
"zerofrom",
5726+
]
5727+
5728+
[[package]]
5729+
name = "yoke-derive"
5730+
version = "0.6.1"
5731+
source = "registry+https://github.com/rust-lang/crates.io-index"
5732+
checksum = "1346e4cd025ae818b88566eac7eb65ab33a994ea55f355c86889af2e7e56b14e"
5733+
dependencies = [
5734+
"proc-macro2",
5735+
"quote",
5736+
"syn",
5737+
"synstructure",
5738+
]
5739+
5740+
[[package]]
5741+
name = "zerofrom"
5742+
version = "0.1.1"
5743+
source = "registry+https://github.com/rust-lang/crates.io-index"
5744+
checksum = "79e9355fccf72b04b7deaa99ce7a0f6630530acf34045391b74460fcd714de54"
5745+
dependencies = [
5746+
"zerofrom-derive",
5747+
]
5748+
5749+
[[package]]
5750+
name = "zerofrom-derive"
5751+
version = "0.1.1"
5752+
source = "registry+https://github.com/rust-lang/crates.io-index"
5753+
checksum = "2e8aa86add9ddbd2409c1ed01e033cd457d79b1b1229b64922c25095c595e829"
5754+
dependencies = [
5755+
"proc-macro2",
5756+
"quote",
5757+
"syn",
5758+
"synstructure",
5759+
]
5760+
5761+
[[package]]
5762+
name = "zerovec"
5763+
version = "0.9.0"
5764+
source = "registry+https://github.com/rust-lang/crates.io-index"
5765+
checksum = "b9d919a74c17749ccb17beaf6405562e413cd94e98ba52ca1e64bbe7eefbd8b8"
5766+
dependencies = [
5767+
"yoke",
5768+
"zerofrom",
5769+
"zerovec-derive",
5770+
]
5771+
5772+
[[package]]
5773+
name = "zerovec-derive"
5774+
version = "0.9.0"
5775+
source = "registry+https://github.com/rust-lang/crates.io-index"
5776+
checksum = "490e5f878c2856225e884c35927e7ea6db3c24cdb7229b72542c7526ad7ed49e"
5777+
dependencies = [
5778+
"proc-macro2",
5779+
"quote",
5780+
"syn",
5781+
"synstructure",
5782+
]

0 commit comments

Comments
 (0)