Skip to content

Commit fe5235e

Browse files
authored
Merge pull request #4224 from rust-lang/rustup-2025-03-11
Automatic Rustup
2 parents 5533da2 + 4f2a03c commit fe5235e

File tree

923 files changed

+13361
-6512
lines changed

Some content is hidden

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

923 files changed

+13361
-6512
lines changed

.github/workflows/post-merge.yml

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Workflow that runs after a merge to master, analyses changes in test executions
2+
# and posts the result to the merged PR.
3+
4+
name: Post merge analysis
5+
6+
on:
7+
push:
8+
branches:
9+
- master
10+
11+
jobs:
12+
analysis:
13+
runs-on: ubuntu-24.04
14+
if: github.repository == 'rust-lang/rust'
15+
permissions:
16+
pull-requests: write
17+
steps:
18+
- uses: actions/checkout@v4
19+
with:
20+
# Make sure that we have enough commits to find the parent merge commit.
21+
# Since all merges should be through merge commits, fetching two commits
22+
# should be enough to get the parent bors merge commit.
23+
fetch-depth: 2
24+
- name: Perform analysis and send PR
25+
env:
26+
GH_TOKEN: ${{ github.token }}
27+
run: |
28+
# Get closest bors merge commit
29+
PARENT_COMMIT=`git rev-list --author='bors <[email protected]>' -n1 --first-parent HEAD^1`
30+
echo "Parent: ${PARENT_COMMIT}"
31+
32+
# Find PR for the current commit
33+
HEAD_PR=`gh pr list --search "${{ github.sha }}" --state merged --json number --jq '.[0].number'`
34+
echo "HEAD: ${{ github.sha }} (#${HEAD_PR})"
35+
36+
cd src/ci/citool
37+
38+
echo "Post-merge analysis result" > output.log
39+
cargo run --release post-merge-analysis ${PARENT_COMMIT} ${{ github.sha }} >> output.log
40+
cat output.log
41+
42+
gh pr comment ${HEAD_PR} -F output.log

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ no_llvm_build
5353
/target
5454
/library/target
5555
/src/bootstrap/target
56+
/src/ci/citool/target
5657
/src/tools/x/target
5758
# Created by `x vendor`
5859
/vendor

Cargo.lock

+23-9
Original file line numberDiff line numberDiff line change
@@ -2526,6 +2526,16 @@ version = "0.2.0"
25262526
source = "registry+https://github.com/rust-lang/crates.io-index"
25272527
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
25282528

2529+
[[package]]
2530+
name = "os_pipe"
2531+
version = "1.2.1"
2532+
source = "registry+https://github.com/rust-lang/crates.io-index"
2533+
checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982"
2534+
dependencies = [
2535+
"libc",
2536+
"windows-sys 0.59.0",
2537+
]
2538+
25292539
[[package]]
25302540
name = "overload"
25312541
version = "0.1.1"
@@ -2871,11 +2881,11 @@ dependencies = [
28712881

28722882
[[package]]
28732883
name = "rand_xoshiro"
2874-
version = "0.6.0"
2884+
version = "0.7.0"
28752885
source = "registry+https://github.com/rust-lang/crates.io-index"
2876-
checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa"
2886+
checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41"
28772887
dependencies = [
2878-
"rand_core 0.6.4",
2888+
"rand_core 0.9.0",
28792889
]
28802890

28812891
[[package]]
@@ -3050,6 +3060,7 @@ dependencies = [
30503060
"gimli 0.31.1",
30513061
"libc",
30523062
"object 0.36.7",
3063+
"os_pipe",
30533064
"regex",
30543065
"serde_json",
30553066
"similar",
@@ -3144,7 +3155,7 @@ name = "rustc_abi"
31443155
version = "0.0.0"
31453156
dependencies = [
31463157
"bitflags",
3147-
"rand 0.8.5",
3158+
"rand 0.9.0",
31483159
"rand_xoshiro",
31493160
"rustc_data_structures",
31503161
"rustc_hashes",
@@ -3286,6 +3297,7 @@ dependencies = [
32863297
"rustc_hir",
32873298
"rustc_lexer",
32883299
"rustc_macros",
3300+
"rustc_middle",
32893301
"rustc_serialize",
32903302
"rustc_session",
32913303
"rustc_span",
@@ -3741,7 +3753,7 @@ dependencies = [
37413753
"rustc_abi",
37423754
"rustc_ast",
37433755
"rustc_ast_pretty",
3744-
"rustc_attr_parsing",
3756+
"rustc_attr_data_structures",
37453757
"rustc_hir",
37463758
"rustc_span",
37473759
]
@@ -3777,7 +3789,7 @@ dependencies = [
37773789
name = "rustc_incremental"
37783790
version = "0.0.0"
37793791
dependencies = [
3780-
"rand 0.8.5",
3792+
"rand 0.9.0",
37813793
"rustc_ast",
37823794
"rustc_data_structures",
37833795
"rustc_errors",
@@ -4009,7 +4021,8 @@ dependencies = [
40094021
"rustc_apfloat",
40104022
"rustc_arena",
40114023
"rustc_ast",
4012-
"rustc_attr_parsing",
4024+
"rustc_ast_ir",
4025+
"rustc_attr_data_structures",
40134026
"rustc_data_structures",
40144027
"rustc_error_messages",
40154028
"rustc_errors",
@@ -5163,8 +5176,8 @@ version = "0.1.0"
51635176
dependencies = [
51645177
"indicatif",
51655178
"num",
5166-
"rand 0.8.5",
5167-
"rand_chacha 0.3.1",
5179+
"rand 0.9.0",
5180+
"rand_chacha 0.9.0",
51685181
"rayon",
51695182
]
51705183

@@ -5260,6 +5273,7 @@ dependencies = [
52605273
"serde",
52615274
"similar",
52625275
"termcolor",
5276+
"toml 0.7.8",
52635277
"walkdir",
52645278
]
52655279

compiler/rustc_abi/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ edition = "2024"
66
[dependencies]
77
# tidy-alphabetical-start
88
bitflags = "2.4.1"
9-
rand = { version = "0.8.4", default-features = false, optional = true }
10-
rand_xoshiro = { version = "0.6.0", optional = true }
11-
rustc_data_structures = { path = "../rustc_data_structures", optional = true }
9+
rand = { version = "0.9.0", default-features = false, optional = true }
10+
rand_xoshiro = { version = "0.7.0", optional = true }
11+
rustc_data_structures = { path = "../rustc_data_structures", optional = true }
1212
rustc_hashes = { path = "../rustc_hashes" }
1313
rustc_index = { path = "../rustc_index", default-features = false }
1414
rustc_macros = { path = "../rustc_macros", optional = true }
15-
rustc_serialize = { path = "../rustc_serialize", optional = true }
15+
rustc_serialize = { path = "../rustc_serialize", optional = true }
1616
rustc_span = { path = "../rustc_span", optional = true }
1717
tracing = "0.1"
1818
# tidy-alphabetical-end

0 commit comments

Comments
 (0)