Skip to content

Commit 171c247

Browse files
authored
Merge pull request #2526 from rust-lang/rustc-pull
Rustc pull update
2 parents 219e4c1 + 7cab27d commit 171c247

File tree

790 files changed

+13830
-7985
lines changed

Some content is hidden

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

790 files changed

+13830
-7985
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,21 @@ jobs:
117117
with:
118118
fetch-depth: 2
119119

120-
# Free up disk space on Linux by removing preinstalled components that
120+
# Free up disk space on Linux and Windows by removing preinstalled components that
121121
# we do not need. We do this to enable some of the less resource
122122
# intensive jobs to run on free runners, which however also have
123123
# less disk space.
124124
- name: free up disk space
125125
run: src/ci/scripts/free-disk-space.sh
126126
if: matrix.free_disk
127127

128+
# If we don't need to free up disk space then just report how much space we have
129+
- name: print disk usage
130+
run: |
131+
echo "disk usage:"
132+
df -h
133+
if: matrix.free_disk == false
134+
128135
# Rust Log Analyzer can't currently detect the PR number of a GitHub
129136
# Actions build on its own, so a hint in the log message is needed to
130137
# point it in the right direction.

Cargo.lock

Lines changed: 154 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -441,20 +441,6 @@ dependencies = [
441441
"thiserror 1.0.69",
442442
]
443443

444-
[[package]]
445-
name = "cargo_metadata"
446-
version = "0.19.2"
447-
source = "registry+https://github.com/rust-lang/crates.io-index"
448-
checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
449-
dependencies = [
450-
"camino",
451-
"cargo-platform 0.1.9",
452-
"semver",
453-
"serde",
454-
"serde_json",
455-
"thiserror 2.0.12",
456-
]
457-
458444
[[package]]
459445
name = "cargo_metadata"
460446
version = "0.21.0"
@@ -480,6 +466,8 @@ version = "1.2.16"
480466
source = "registry+https://github.com/rust-lang/crates.io-index"
481467
checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
482468
dependencies = [
469+
"jobserver",
470+
"libc",
483471
"shlex",
484472
]
485473

@@ -669,6 +657,26 @@ dependencies = [
669657
"serde",
670658
]
671659

660+
[[package]]
661+
name = "cmake"
662+
version = "0.1.54"
663+
source = "registry+https://github.com/rust-lang/crates.io-index"
664+
checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
665+
dependencies = [
666+
"cc",
667+
]
668+
669+
[[package]]
670+
name = "codespan-reporting"
671+
version = "0.12.0"
672+
source = "registry+https://github.com/rust-lang/crates.io-index"
673+
checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
674+
dependencies = [
675+
"serde",
676+
"termcolor",
677+
"unicode-width 0.2.1",
678+
]
679+
672680
[[package]]
673681
name = "collect-license-metadata"
674682
version = "0.1.0"
@@ -927,6 +935,68 @@ dependencies = [
927935
"windows-sys 0.59.0",
928936
]
929937

938+
[[package]]
939+
name = "cxx"
940+
version = "1.0.161"
941+
source = "registry+https://github.com/rust-lang/crates.io-index"
942+
checksum = "a3523cc02ad831111491dd64b27ad999f1ae189986728e477604e61b81f828df"
943+
dependencies = [
944+
"cc",
945+
"cxxbridge-cmd",
946+
"cxxbridge-flags",
947+
"cxxbridge-macro",
948+
"foldhash",
949+
"link-cplusplus",
950+
]
951+
952+
[[package]]
953+
name = "cxx-build"
954+
version = "1.0.161"
955+
source = "registry+https://github.com/rust-lang/crates.io-index"
956+
checksum = "212b754247a6f07b10fa626628c157593f0abf640a3dd04cce2760eca970f909"
957+
dependencies = [
958+
"cc",
959+
"codespan-reporting",
960+
"indexmap",
961+
"proc-macro2",
962+
"quote",
963+
"scratch",
964+
"syn 2.0.104",
965+
]
966+
967+
[[package]]
968+
name = "cxxbridge-cmd"
969+
version = "1.0.161"
970+
source = "registry+https://github.com/rust-lang/crates.io-index"
971+
checksum = "f426a20413ec2e742520ba6837c9324b55ffac24ead47491a6e29f933c5b135a"
972+
dependencies = [
973+
"clap",
974+
"codespan-reporting",
975+
"indexmap",
976+
"proc-macro2",
977+
"quote",
978+
"syn 2.0.104",
979+
]
980+
981+
[[package]]
982+
name = "cxxbridge-flags"
983+
version = "1.0.161"
984+
source = "registry+https://github.com/rust-lang/crates.io-index"
985+
checksum = "a258b6069020b4e5da6415df94a50ee4f586a6c38b037a180e940a43d06a070d"
986+
987+
[[package]]
988+
name = "cxxbridge-macro"
989+
version = "1.0.161"
990+
source = "registry+https://github.com/rust-lang/crates.io-index"
991+
checksum = "e8dec184b52be5008d6eaf7e62fc1802caf1ad1227d11b3b7df2c409c7ffc3f4"
992+
dependencies = [
993+
"indexmap",
994+
"proc-macro2",
995+
"quote",
996+
"rustversion",
997+
"syn 2.0.104",
998+
]
999+
9301000
[[package]]
9311001
name = "darling"
9321002
version = "0.20.11"
@@ -1364,7 +1434,7 @@ version = "0.1.0"
13641434
dependencies = [
13651435
"anyhow",
13661436
"askama",
1367-
"cargo_metadata 0.18.1",
1437+
"cargo_metadata 0.21.0",
13681438
"serde",
13691439
"serde_json",
13701440
"thiserror 1.0.69",
@@ -1387,6 +1457,17 @@ dependencies = [
13871457
"version_check",
13881458
]
13891459

1460+
[[package]]
1461+
name = "genmc-sys"
1462+
version = "0.1.0"
1463+
dependencies = [
1464+
"cc",
1465+
"cmake",
1466+
"cxx",
1467+
"cxx-build",
1468+
"git2",
1469+
]
1470+
13901471
[[package]]
13911472
name = "getopts"
13921473
version = "0.2.23"
@@ -1441,6 +1522,21 @@ dependencies = [
14411522
"stable_deref_trait",
14421523
]
14431524

1525+
[[package]]
1526+
name = "git2"
1527+
version = "0.20.2"
1528+
source = "registry+https://github.com/rust-lang/crates.io-index"
1529+
checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110"
1530+
dependencies = [
1531+
"bitflags",
1532+
"libc",
1533+
"libgit2-sys",
1534+
"log",
1535+
"openssl-probe",
1536+
"openssl-sys",
1537+
"url",
1538+
]
1539+
14441540
[[package]]
14451541
name = "glob"
14461542
version = "0.3.2"
@@ -1890,16 +1986,16 @@ dependencies = [
18901986

18911987
[[package]]
18921988
name = "ipc-channel"
1893-
version = "0.20.0"
1989+
version = "0.20.1"
18941990
source = "registry+https://github.com/rust-lang/crates.io-index"
1895-
checksum = "5b1c98b70019c830a1fc39cecfe1f60ff99c4122f0a189697c810c90ec545c14"
1991+
checksum = "1700f6b8b9f00cdd675f32fbb3a5be882213140dfe045805273221ca266c43f8"
18961992
dependencies = [
18971993
"bincode",
18981994
"crossbeam-channel",
18991995
"fnv",
19001996
"libc",
19011997
"mio",
1902-
"rand 0.9.1",
1998+
"rand 0.9.2",
19031999
"serde",
19042000
"tempfile",
19052001
"uuid",
@@ -2074,6 +2170,19 @@ dependencies = [
20742170
"cc",
20752171
]
20762172

2173+
[[package]]
2174+
name = "libgit2-sys"
2175+
version = "0.18.2+1.9.1"
2176+
source = "registry+https://github.com/rust-lang/crates.io-index"
2177+
checksum = "1c42fe03df2bd3c53a3a9c7317ad91d80c81cd1fb0caec8d7cc4cd2bfa10c222"
2178+
dependencies = [
2179+
"cc",
2180+
"libc",
2181+
"libz-sys",
2182+
"openssl-sys",
2183+
"pkg-config",
2184+
]
2185+
20772186
[[package]]
20782187
name = "libloading"
20792188
version = "0.8.8"
@@ -2113,6 +2222,15 @@ dependencies = [
21132222
"vcpkg",
21142223
]
21152224

2225+
[[package]]
2226+
name = "link-cplusplus"
2227+
version = "1.0.10"
2228+
source = "registry+https://github.com/rust-lang/crates.io-index"
2229+
checksum = "4a6f6da007f968f9def0d65a05b187e2960183de70c160204ecfccf0ee330212"
2230+
dependencies = [
2231+
"cc",
2232+
]
2233+
21162234
[[package]]
21172235
name = "linkchecker"
21182236
version = "0.1.0"
@@ -2322,14 +2440,15 @@ dependencies = [
23222440
"chrono-tz",
23232441
"colored 3.0.0",
23242442
"directories",
2443+
"genmc-sys",
23252444
"getrandom 0.3.3",
23262445
"ipc-channel",
23272446
"libc",
23282447
"libffi",
23292448
"libloading",
23302449
"measureme",
23312450
"nix",
2332-
"rand 0.9.1",
2451+
"rand 0.9.2",
23332452
"regex",
23342453
"rustc_version",
23352454
"serde",
@@ -2962,9 +3081,9 @@ dependencies = [
29623081

29633082
[[package]]
29643083
name = "rand"
2965-
version = "0.9.1"
3084+
version = "0.9.2"
29663085
source = "registry+https://github.com/rust-lang/crates.io-index"
2967-
checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
3086+
checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
29683087
dependencies = [
29693088
"rand_chacha 0.9.0",
29703089
"rand_core 0.9.3",
@@ -3048,9 +3167,9 @@ dependencies = [
30483167

30493168
[[package]]
30503169
name = "redox_syscall"
3051-
version = "0.5.13"
3170+
version = "0.5.16"
30523171
source = "registry+https://github.com/rust-lang/crates.io-index"
3053-
checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
3172+
checksum = "7251471db004e509f4e75a62cca9435365b5ec7bcdff530d612ac7c87c44a792"
30543173
dependencies = [
30553174
"bitflags",
30563175
]
@@ -3245,7 +3364,7 @@ name = "rustc_abi"
32453364
version = "0.0.0"
32463365
dependencies = [
32473366
"bitflags",
3248-
"rand 0.9.1",
3367+
"rand 0.9.2",
32493368
"rand_xoshiro",
32503369
"rustc_data_structures",
32513370
"rustc_hashes",
@@ -3880,7 +3999,7 @@ dependencies = [
38803999
name = "rustc_incremental"
38814000
version = "0.0.0"
38824001
dependencies = [
3883-
"rand 0.9.1",
4002+
"rand 0.9.2",
38844003
"rustc_ast",
38854004
"rustc_data_structures",
38864005
"rustc_errors",
@@ -4493,7 +4612,7 @@ dependencies = [
44934612
"bitflags",
44944613
"getopts",
44954614
"libc",
4496-
"rand 0.9.1",
4615+
"rand 0.9.2",
44974616
"rustc_abi",
44984617
"rustc_ast",
44994618
"rustc_data_structures",
@@ -4578,7 +4697,7 @@ dependencies = [
45784697
"crossbeam-deque",
45794698
"crossbeam-utils",
45804699
"libc",
4581-
"rand 0.9.1",
4700+
"rand 0.9.2",
45824701
"rand_xorshift",
45834702
"scoped-tls",
45844703
"smallvec",
@@ -4891,6 +5010,12 @@ version = "1.2.0"
48915010
source = "registry+https://github.com/rust-lang/crates.io-index"
48925011
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
48935012

5013+
[[package]]
5014+
name = "scratch"
5015+
version = "1.0.8"
5016+
source = "registry+https://github.com/rust-lang/crates.io-index"
5017+
checksum = "9f6280af86e5f559536da57a45ebc84948833b3bee313a7dd25232e09c878a52"
5018+
48945019
[[package]]
48955020
name = "self_cell"
48965021
version = "1.2.0"
@@ -5284,7 +5409,7 @@ version = "0.1.0"
52845409
dependencies = [
52855410
"indicatif",
52865411
"num",
5287-
"rand 0.9.1",
5412+
"rand 0.9.2",
52885413
"rand_chacha 0.9.0",
52895414
"rayon",
52905415
]
@@ -5370,7 +5495,7 @@ name = "tidy"
53705495
version = "0.1.0"
53715496
dependencies = [
53725497
"build_helper",
5373-
"cargo_metadata 0.19.2",
5498+
"cargo_metadata 0.21.0",
53745499
"fluent-syntax",
53755500
"ignore",
53765501
"miropt-test-tools",

bootstrap.example.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,11 @@
465465
# What custom diff tool to use for displaying compiletest tests.
466466
#build.compiletest-diff-tool = <none>
467467

468+
# Whether to allow `compiletest` self-tests and `compiletest`-managed test
469+
# suites to be run against the stage 0 rustc. This is only intended to be used
470+
# when the stage 0 compiler is actually built from in-tree sources.
471+
#build.compiletest-allow-stage0 = false
472+
468473
# Whether to use the precompiled stage0 libtest with compiletest.
469474
#build.compiletest-use-stage0-libtest = true
470475

@@ -475,6 +480,9 @@
475480
# Note that if any value is manually given to bootstrap such as
476481
# `./x test tidy --extra-checks=js`, this value is ignored.
477482
# Use `--extra-checks=''` to temporarily disable all extra checks.
483+
#
484+
# Automatically enabled in the "tools" profile.
485+
# Set to the empty string to force disable (recommeded for hdd systems).
478486
#build.tidy-extra-checks = ""
479487

480488
# Indicates whether ccache is used when building certain artifacts (e.g. LLVM).

0 commit comments

Comments
 (0)