Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 5 pull requests #120437

Closed
wants to merge 13 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

tmandry and others added 13 commits January 26, 2024 13:09
This refactors run.sh to never override an explicit $CODEGEN_BACKENDS if
set in the build.
This includes a change to the upstream build_fuchsia_from_rust_ci script
that builds a minimal set of tests, to improve coverage on this builder.
For consistency with normal functions.
It has 1-to-1 correspondence to its expression id.

Also remove mostly useless `visit_let_expr`.
…ark-Simulacrum

Bump Fuchsia, build tests, and use 8 core bots

- Build Fuchsia on 8 cores instead of 16
- Skip building cranelift for Fuchsia
- Bump Fuchsia (includes building tests)

This includes a change to the upstream build_fuchsia_from_rust_ci script that builds a minimal set of tests, to improve coverage on this builder. This would have caught rust-lang/rust-clippy#11952 and rust-lang#119593.

See prior discussion on rust-lang#119400 about building on 8 cores instead of 16. This PR combines changes from that and rust-lang#119399, plus clean up.

r? ````@Mark-Simulacrum````
…tree, r=cjgillot

Make the coroutine def id of an async closure the child of the closure def id

Adjust def collection to make the (inner) coroutine returned by an async closure be a def id child of the (outer) closure. This makes it easy to map from coroutine -> closure by using `tcx.parent`, since currently it's not trivial to do this.
…tive, r=Nilstrieb

Stop using derivative in rustc_pattern_analysis

CC rust-lang#109302, rust-lang/rust-analyzer#16420 (comment)

r? ```@Nadrieril```
…Nilstrieb

Remove unnecessary unit returns in query declarations

For consistency with normal functions.
…errors

hir: Two preparatory changes for rust-lang#120206

cc rust-lang#120206
r? `@compiler-errors`
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jan 28, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jan 28, 2024

📌 Commit 4a759f0 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 28, 2024
@bors
Copy link
Contributor

bors commented Jan 28, 2024

⌛ Testing commit 4a759f0 with merge a162071...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 28, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#120358 (Bump Fuchsia, build tests, and use 8 core bots)
 - rust-lang#120402 (Make the coroutine def id of an async closure the child of the closure def id)
 - rust-lang#120420 (Stop using derivative in rustc_pattern_analysis)
 - rust-lang#120425 (Remove unnecessary unit returns in query declarations)
 - rust-lang#120428 (hir: Two preparatory changes for rust-lang#120206)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Jan 28, 2024

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 28, 2024
@matthiaskrgr
Copy link
Member Author

@bors retry

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 28, 2024
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Contributor

bors commented Jan 28, 2024

⌛ Testing commit 4a759f0 with merge 769e1fe...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 28, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#120358 (Bump Fuchsia, build tests, and use 8 core bots)
 - rust-lang#120402 (Make the coroutine def id of an async closure the child of the closure def id)
 - rust-lang#120420 (Stop using derivative in rustc_pattern_analysis)
 - rust-lang#120425 (Remove unnecessary unit returns in query declarations)
 - rust-lang#120428 (hir: Two preparatory changes for rust-lang#120206)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Jan 28, 2024

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 28, 2024
@matthiaskrgr
Copy link
Member Author

@bors retry apple dist various not starting

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 28, 2024
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Contributor

bors commented Jan 28, 2024

⌛ Testing commit 4a759f0 with merge 8d9b7de...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 28, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#120358 (Bump Fuchsia, build tests, and use 8 core bots)
 - rust-lang#120402 (Make the coroutine def id of an async closure the child of the closure def id)
 - rust-lang#120420 (Stop using derivative in rustc_pattern_analysis)
 - rust-lang#120425 (Remove unnecessary unit returns in query declarations)
 - rust-lang#120428 (hir: Two preparatory changes for rust-lang#120206)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Jan 28, 2024

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 28, 2024
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@fmease
Copy link
Member

fmease commented Jan 29, 2024

@bors retry one last time

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 29, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 29, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#120358 (Bump Fuchsia, build tests, and use 8 core bots)
 - rust-lang#120402 (Make the coroutine def id of an async closure the child of the closure def id)
 - rust-lang#120420 (Stop using derivative in rustc_pattern_analysis)
 - rust-lang#120425 (Remove unnecessary unit returns in query declarations)
 - rust-lang#120428 (hir: Two preparatory changes for rust-lang#120206)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Jan 29, 2024

⌛ Testing commit 4a759f0 with merge abbba77...

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-apple-1 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
SCCACHE_BUCKET=rust-lang-ci-sccache2
SCRIPT=./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps
SHELL=/bin/bash
SHLVL=3
SSH_AUTH_SOCK=/private/tmp/com.apple.launchd.oGJhfiHwJc/Listeners
STATS_EXTP=https://provjobdsettingscdn.blob.core.windows.net/settings/provjobdsettings-0.5.154/provjobd.data
STATS_RDCL=true
STATS_TIS=mining
STATS_TRP=true

@bors
Copy link
Contributor

bors commented Jan 29, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 29, 2024
@matthiaskrgr
Copy link
Member Author

well, tempted to just rollup=iffy all 5 and call it a day :|

@fmease
Copy link
Member

fmease commented Jan 29, 2024

The job x86_64-apple-1 failed!

---- core::config::config::tests::detect_src_and_out stdout ----
downloading https://static.rust-lang.org/dist/2023-12-22/rust-std-beta-x86_64-apple-darwin.tar.xz
extracting /tmp/cache/2023-12-22/rust-std-beta-x86_64-apple-darwin.tar.xz to /tmp/x86_64-apple-darwin/stage0
downloading https://static.rust-lang.org/dist/2023-12-22/rustc-beta-x86_64-apple-darwin.tar.xz
extracting /tmp/cache/2023-12-22/rustc-beta-x86_64-apple-darwin.tar.xz to /tmp/x86_64-apple-darwin/stage0
downloading https://static.rust-lang.org/dist/2023-12-22/cargo-beta-x86_64-apple-darwin.tar.xz
thread 'core::config::config::tests::detect_src_and_out' panicked at /Users/runner/work/rust/rust/src/tools/build_helper/src/util.rs:18:9:
status code: 1


failures:
    core::config::config::tests::detect_src_and_out

@onur-ozkan Any idea what might've happened here?

@onur-ozkan
Copy link
Member

The job x86_64-apple-1 failed!

---- core::config::config::tests::detect_src_and_out stdout ----
downloading https://static.rust-lang.org/dist/2023-12-22/rust-std-beta-x86_64-apple-darwin.tar.xz
extracting /tmp/cache/2023-12-22/rust-std-beta-x86_64-apple-darwin.tar.xz to /tmp/x86_64-apple-darwin/stage0
downloading https://static.rust-lang.org/dist/2023-12-22/rustc-beta-x86_64-apple-darwin.tar.xz
extracting /tmp/cache/2023-12-22/rustc-beta-x86_64-apple-darwin.tar.xz to /tmp/x86_64-apple-darwin/stage0
downloading https://static.rust-lang.org/dist/2023-12-22/cargo-beta-x86_64-apple-darwin.tar.xz
thread 'core::config::config::tests::detect_src_and_out' panicked at /Users/runner/work/rust/rust/src/tools/build_helper/src/util.rs:18:9:
status code: 1


failures:
    core::config::config::tests::detect_src_and_out

@onur-ozkan Any idea what might've happened here?

I don't see any helpful information in the log. I would give it another shot since the previous attempts didn't have this issue.

@fmease fmease closed this Jan 30, 2024
@matthiaskrgr matthiaskrgr deleted the rollup-h1uai71 branch March 16, 2024 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.