Skip to content

Commit b2a10f4

Browse files
bors-ferrocene[bot]bjorn3KobzolRalfJungbors
authored
Merge #46
46: Pull upstream master 2023 10 10 r=tshepang a=Dajamante * rust-lang/rust#109882 * rust-lang/rust#116497 * rust-lang/rust#116532 * rust-lang/rust#116569 * rust-lang/rust#116561 * rust-lang/rust#116556 * rust-lang/rust#116549 * rust-lang/rust#116543 * rust-lang/rust#116537 * rust-lang/rust#115882 * rust-lang/rust#116142 * rust-lang/rust#115238 * rust-lang/rust#116533 * rust-lang/rust#116096 * rust-lang/rust#116468 * rust-lang/rust#116515 * rust-lang/rust#116454 * rust-lang/rust#116183 * rust-lang/rust#116514 * rust-lang/rust#116509 * rust-lang/rust#116487 * rust-lang/rust#116486 * rust-lang/rust#116450 * rust-lang/rust#114623 * rust-lang/rust#116416 * rust-lang/rust#116437 * rust-lang/rust#100806 * rust-lang/rust#116330 * rust-lang/rust#116310 * rust-lang/rust#115583 * rust-lang/rust#116457 * rust-lang/rust#116508 * rust-lang/rust#109214 * rust-lang/rust#116318 * rust-lang/rust#116501 * rust-lang/rust#116500 * rust-lang/rust#116458 * rust-lang/rust#116400 * rust-lang/rust#116277 * rust-lang/rust#114709 * rust-lang/rust#116492 * rust-lang/rust#116484 * rust-lang/rust#116481 * rust-lang/rust#116474 * rust-lang/rust#116466 * rust-lang/rust#116423 * rust-lang/rust#116297 * rust-lang/rust#114564 * rust-lang/rust#114811 * rust-lang/rust#116489 * rust-lang/rust#115304 Co-authored-by: bjorn3 <[email protected]> Co-authored-by: Jakub Beránek <[email protected]> Co-authored-by: Ralf Jung <[email protected]> Co-authored-by: bors <[email protected]> Co-authored-by: blyxyas <[email protected]> Co-authored-by: ouz-a <[email protected]> Co-authored-by: Peter Jaszkowiak <[email protected]> Co-authored-by: Michael Goulet <[email protected]> Co-authored-by: koka <[email protected]> Co-authored-by: Eduardo Sánchez Muñoz <[email protected]> Co-authored-by: Esteban Küber <[email protected]> Co-authored-by: xFrednet <[email protected]>
2 parents 82db5c5 + 0b35a69 commit b2a10f4

File tree

634 files changed

+15008
-10218
lines changed

Some content is hidden

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

634 files changed

+15008
-10218
lines changed

Cargo.lock

Lines changed: 131 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ dependencies = [
812812
name = "cargo-miri"
813813
version = "0.1.0"
814814
dependencies = [
815-
"cargo_metadata",
815+
"cargo_metadata 0.18.0",
816816
"directories",
817817
"rustc-build-sysroot",
818818
"rustc_tools_util",
@@ -844,6 +844,20 @@ dependencies = [
844844
"thiserror",
845845
]
846846

847+
[[package]]
848+
name = "cargo_metadata"
849+
version = "0.18.0"
850+
source = "registry+https://github.com/rust-lang/crates.io-index"
851+
checksum = "fb9ac64500cc83ce4b9f8dafa78186aa008c8dea77a09b94cd307fd0cd5022a8"
852+
dependencies = [
853+
"camino",
854+
"cargo-platform",
855+
"semver",
856+
"serde",
857+
"serde_json",
858+
"thiserror",
859+
]
860+
847861
[[package]]
848862
name = "cargotest2"
849863
version = "0.1.0"
@@ -929,10 +943,12 @@ checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
929943

930944
[[package]]
931945
name = "clippy"
932-
version = "0.1.74"
946+
version = "0.1.75"
933947
dependencies = [
948+
"anstream",
934949
"clippy_lints",
935950
"clippy_utils",
951+
"color-print",
936952
"filetime",
937953
"futures",
938954
"if_chain",
@@ -967,10 +983,10 @@ dependencies = [
967983

968984
[[package]]
969985
name = "clippy_lints"
970-
version = "0.1.74"
986+
version = "0.1.75"
971987
dependencies = [
972988
"arrayvec",
973-
"cargo_metadata",
989+
"cargo_metadata 0.15.4",
974990
"clippy_utils",
975991
"declare_clippy_lint",
976992
"if_chain",
@@ -987,11 +1003,12 @@ dependencies = [
9871003
"unicode-normalization",
9881004
"unicode-script",
9891005
"url",
1006+
"walkdir",
9901007
]
9911008

9921009
[[package]]
9931010
name = "clippy_utils"
994-
version = "0.1.74"
1011+
version = "0.1.75"
9951012
dependencies = [
9961013
"arrayvec",
9971014
"if_chain",
@@ -1024,6 +1041,27 @@ dependencies = [
10241041
"tracing-error",
10251042
]
10261043

1044+
[[package]]
1045+
name = "color-print"
1046+
version = "0.3.5"
1047+
source = "registry+https://github.com/rust-lang/crates.io-index"
1048+
checksum = "7a858372ff14bab9b1b30ea504f2a4bc534582aee3e42ba2d41d2a7baba63d5d"
1049+
dependencies = [
1050+
"color-print-proc-macro",
1051+
]
1052+
1053+
[[package]]
1054+
name = "color-print-proc-macro"
1055+
version = "0.3.5"
1056+
source = "registry+https://github.com/rust-lang/crates.io-index"
1057+
checksum = "57e37866456a721d0a404439a1adae37a31be4e0055590d053dfe6981e05003f"
1058+
dependencies = [
1059+
"nom",
1060+
"proc-macro2",
1061+
"quote",
1062+
"syn 1.0.109",
1063+
]
1064+
10271065
[[package]]
10281066
name = "color-spantrace"
10291067
version = "0.2.0"
@@ -1400,7 +1438,7 @@ checksum = "a0afaad2b26fa326569eb264b1363e8ae3357618c43982b3f285f0774ce76b69"
14001438

14011439
[[package]]
14021440
name = "declare_clippy_lint"
1403-
version = "0.1.74"
1441+
version = "0.1.75"
14041442
dependencies = [
14051443
"itertools",
14061444
"quote",
@@ -1508,11 +1546,11 @@ dependencies = [
15081546

15091547
[[package]]
15101548
name = "directories"
1511-
version = "4.0.1"
1549+
version = "5.0.1"
15121550
source = "registry+https://github.com/rust-lang/crates.io-index"
1513-
checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
1551+
checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
15141552
dependencies = [
1515-
"dirs-sys",
1553+
"dirs-sys 0.4.1",
15161554
]
15171555

15181556
[[package]]
@@ -1521,7 +1559,7 @@ version = "4.0.0"
15211559
source = "registry+https://github.com/rust-lang/crates.io-index"
15221560
checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
15231561
dependencies = [
1524-
"dirs-sys",
1562+
"dirs-sys 0.3.7",
15251563
]
15261564

15271565
[[package]]
@@ -1545,6 +1583,18 @@ dependencies = [
15451583
"winapi",
15461584
]
15471585

1586+
[[package]]
1587+
name = "dirs-sys"
1588+
version = "0.4.1"
1589+
source = "registry+https://github.com/rust-lang/crates.io-index"
1590+
checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
1591+
dependencies = [
1592+
"libc",
1593+
"option-ext",
1594+
"redox_users",
1595+
"windows-sys 0.48.0",
1596+
]
1597+
15481598
[[package]]
15491599
name = "dirs-sys-next"
15501600
version = "0.1.2"
@@ -3296,12 +3346,19 @@ dependencies = [
32963346
"serde",
32973347
"serde_json",
32983348
"sysinfo",
3349+
"tabled",
32993350
"tar",
33003351
"tempfile",
33013352
"xz",
33023353
"zip",
33033354
]
33043355

3356+
[[package]]
3357+
name = "option-ext"
3358+
version = "0.2.0"
3359+
source = "registry+https://github.com/rust-lang/crates.io-index"
3360+
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
3361+
33053362
[[package]]
33063363
name = "outref"
33073364
version = "0.5.1"
@@ -3374,6 +3431,17 @@ dependencies = [
33743431
"unwind",
33753432
]
33763433

3434+
[[package]]
3435+
name = "papergrid"
3436+
version = "0.10.0"
3437+
source = "registry+https://github.com/rust-lang/crates.io-index"
3438+
checksum = "a2ccbe15f2b6db62f9a9871642746427e297b0ceb85f9a7f1ee5ff47d184d0c8"
3439+
dependencies = [
3440+
"bytecount",
3441+
"fnv",
3442+
"unicode-width",
3443+
]
3444+
33773445
[[package]]
33783446
name = "parking_lot"
33793447
version = "0.11.2"
@@ -3630,6 +3698,30 @@ dependencies = [
36303698
"elliptic-curve",
36313699
]
36323700

3701+
[[package]]
3702+
name = "proc-macro-error"
3703+
version = "1.0.4"
3704+
source = "registry+https://github.com/rust-lang/crates.io-index"
3705+
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
3706+
dependencies = [
3707+
"proc-macro-error-attr",
3708+
"proc-macro2",
3709+
"quote",
3710+
"syn 1.0.109",
3711+
"version_check",
3712+
]
3713+
3714+
[[package]]
3715+
name = "proc-macro-error-attr"
3716+
version = "1.0.4"
3717+
source = "registry+https://github.com/rust-lang/crates.io-index"
3718+
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
3719+
dependencies = [
3720+
"proc-macro2",
3721+
"quote",
3722+
"version_check",
3723+
]
3724+
36333725
[[package]]
36343726
name = "proc-macro-hack"
36353727
version = "0.5.20+deprecated"
@@ -5064,7 +5156,6 @@ dependencies = [
50645156
"rustc_errors",
50655157
"rustc_hir",
50665158
"rustc_index",
5067-
"rustc_macros",
50685159
"rustc_middle",
50695160
"rustc_query_system",
50705161
"rustc_serialize",
@@ -5170,7 +5261,6 @@ dependencies = [
51705261
"rustc_hir",
51715262
"rustc_interface",
51725263
"rustc_middle",
5173-
"rustc_session",
51745264
"rustc_span",
51755265
"rustc_target",
51765266
"stable_mir",
@@ -5417,7 +5507,7 @@ dependencies = [
54175507
"annotate-snippets",
54185508
"anyhow",
54195509
"bytecount",
5420-
"cargo_metadata",
5510+
"cargo_metadata 0.15.4",
54215511
"clap",
54225512
"diff",
54235513
"dirs",
@@ -5852,6 +5942,7 @@ version = "0.0.0"
58525942
dependencies = [
58535943
"addr2line",
58545944
"alloc",
5945+
"cc",
58555946
"cfg-if",
58565947
"compiler_builtins",
58575948
"core",
@@ -6021,6 +6112,30 @@ dependencies = [
60216112
"test",
60226113
]
60236114

6115+
[[package]]
6116+
name = "tabled"
6117+
version = "0.13.0"
6118+
source = "registry+https://github.com/rust-lang/crates.io-index"
6119+
checksum = "4d38d39c754ae037a9bc3ca1580a985db7371cd14f1229172d1db9093feb6739"
6120+
dependencies = [
6121+
"papergrid",
6122+
"tabled_derive",
6123+
"unicode-width",
6124+
]
6125+
6126+
[[package]]
6127+
name = "tabled_derive"
6128+
version = "0.6.0"
6129+
source = "registry+https://github.com/rust-lang/crates.io-index"
6130+
checksum = "99f688a08b54f4f02f0a3c382aefdb7884d3d69609f785bd253dc033243e3fe4"
6131+
dependencies = [
6132+
"heck",
6133+
"proc-macro-error",
6134+
"proc-macro2",
6135+
"quote",
6136+
"syn 1.0.109",
6137+
]
6138+
60246139
[[package]]
60256140
name = "tar"
60266141
version = "0.4.38"
@@ -6202,7 +6317,7 @@ name = "tidy"
62026317
version = "0.1.0"
62036318
dependencies = [
62046319
"cargo-platform",
6205-
"cargo_metadata",
6320+
"cargo_metadata 0.15.4",
62066321
"ignore",
62076322
"lazy_static",
62086323
"miropt-test-tools",
@@ -6562,7 +6677,7 @@ dependencies = [
65626677
"anyhow",
65636678
"bstr",
65646679
"cargo-platform",
6565-
"cargo_metadata",
6680+
"cargo_metadata 0.15.4",
65666681
"color-eyre",
65676682
"colored",
65686683
"comma",
@@ -6589,7 +6704,7 @@ dependencies = [
65896704
"anyhow",
65906705
"bstr",
65916706
"cargo-platform",
6592-
"cargo_metadata",
6707+
"cargo_metadata 0.15.4",
65936708
"color-eyre",
65946709
"colored",
65956710
"comma",

0 commit comments

Comments
 (0)