Skip to content

Rollup of 5 pull requests #135388

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 12 commits into from
Closed

Rollup of 5 pull requests #135388

wants to merge 12 commits into from

Conversation

jhpratt
Copy link
Member

@jhpratt jhpratt commented Jan 12, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

asomers and others added 12 commits October 28, 2024 08:58
@asomers
CI: build FreeBSD artifacts on FreeBSD 13.4
cf34545 
13.2 is EoL, and 13.3 will be EoL too in about 2 months.  Plus, both
suffer from a bug in LLVM's libunwind.  It causes a segfault inside of
std::backtrace::Backtrace::capture().

Fixes rust-lang#132185
@kadiwa4
remove emsdk update from relnotes
44d760f
@yotamofek
fix it's -> its in doc comment
86d2129
@yotamofek
improve clunky grammar in borrowck diagnostic
6680bc5
@yotamofek
collect diag suggestions instead of pushing into vector repeatedly
27b0693
@lolbinarycat
allow rustdoc-js tests to be run at stage0
af2247c 
this mirrors the behavior of rustdoc-js-std tests.

previously this required COMPILETEST_FORCE_STAGE0.
@steffahn
Make UniqueRc invariant for soundness
df57d65
@jhpratt
Rollup merge of rust-lang#132232 - asomers:fbsd-13.4, r=Mark-Simulacrum
debf3d4 
CI: build FreeBSD artifacts on FreeBSD 13.4

13.2 is EoL, and 13.3 will be EoL too in about 2 months.  Plus, both suffer from a bug in LLVM's libunwind.  It causes a segfault inside of std::backtrace::Backtrace::capture().

Fixes rust-lang#132185

cc `@ehuss` .  before you can do the trybuild, you'll also have to download new FreeBSD 13.4 base.txz images and place them in https://ci-mirrors.rust-lang.org/rustc , then update this PR with the correct file names.

try-job: dist-x86_64-freebsd
@jhpratt
Rollup merge of rust-lang#135266 - kadiwa4:no_emsdk_update, r=Mark-Si…
f6fc19f 
…mulacrum

Remove emsdk version update from 1.84.0 relnotes

See [this comment](rust-lang#131467 (comment)). The reproducer in that comment does indeed show that rustup's `rust-std` component is still compiled with the old emscripten ABI because libc's config flag `emscripten_new_stat_abi` is not set.

rust-lang#131533 presumably had no effect because the wrong CI file was modified. So nothing has changed since 1.83.0. The PR author (workingjubilee) is currently on vacation.
Also the issue rust-lang#131467 should be reopened.
@jhpratt
Rollup merge of rust-lang#135364 - yotamofek:borrowck-diag-fix, r=com…
0fe2aac 
…piler-errors

Cleanup `suggest_binding_for_closure_capture_self` diag in borrowck

Mostly grammar fix/improvement, but also a small cleanup to use iterators instead of for loops for collecting into a vector.
@jhpratt
Rollup merge of rust-lang#135375 - lolbinarycat:bootstrap-allow-stage…
a029084 
…0-rustdoc-js, r=jieyouxu

allow rustdoc-js tests to be run at stage0

this mirrors the behavior of rustdoc-js-std tests.

previously this required COMPILETEST_FORCE_STAGE0.
@jhpratt
Rollup merge of rust-lang#135379 - steffahn:uniquerc-invariant, r=Mar…
948f071 
…k-Simulacrum

Make (unstable API) `UniqueRc` invariant for soundness

Add test case from rust-lang#133572 (comment) (comment in review of `UniqueArc`), and fix the issue for `UniqueRc`.
@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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jan 12, 2025
@jhpratt
Copy link
Member Author

jhpratt commented Jan 12, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jan 12, 2025

📌 Commit 948f071 has been approved by jhpratt

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 12, 2025
@bors
Copy link
Collaborator

bors commented Jan 12, 2025

⌛ Testing commit 948f071 with merge 3a49e62...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 12, 2025
@bors
Auto merge of rust-lang#135388 - jhpratt:rollup-zeyd0r8, r=jhpratt
3a49e62 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#132232 (CI: build FreeBSD artifacts on FreeBSD 13.4)
 - rust-lang#135266 (Remove emsdk version update from 1.84.0 relnotes)
 - rust-lang#135364 (Cleanup `suggest_binding_for_closure_capture_self` diag in borrowck)
 - rust-lang#135375 (allow rustdoc-js tests to be run at stage0)
 - rust-lang#135379 (Make (unstable API) `UniqueRc` invariant for soundness)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

The job dist-various-2 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
#13 DONE 27.8s

#14 [ 6/26] RUN apt-key adv --batch --yes --keyserver keyserver.ubuntu.com --recv-keys 74DA7924C5513486
#14 0.201 Warning: apt-key is deprecated. Manage keyring files in trusted.gpg.d instead (see apt-key(8)).
#14 0.219 Executing: /tmp/apt-key-gpghome.sf3nuiox64/gpg.1.sh --batch --yes --keyserver keyserver.ubuntu.com --recv-keys 74DA7924C5513486
#14 0.598 gpg: Total number processed: 1
#14 0.598 gpg:               imported: 1
#14 DONE 0.7s

---
#18 1.752 
#18 1.752 gzip: stdin: unexpected end of file
#18 1.752 tar: Child returned status 1
#18 1.752 tar: Error is not recoverable: exiting now
#18 ERROR: process "/bin/sh -c env     CC=arm-linux-gnueabi-gcc-9 CFLAGS=\"-march=armv7-a\"     CXX=arm-linux-gnueabi-g++-9 CXXFLAGS=\"-march=armv7-a\"     bash musl.sh armv7 &&     env     CC=riscv64-linux-gnu-gcc-11     CXX=riscv64-linux-gnu-g++-11     bash musl.sh riscv64gc &&     rm -rf /build/*" did not complete successfully: exit code: 2
 > importing cache manifest from ghcr.io/rust-lang-ci/rust-ci-cache:c6f8289ddaae650c667ec721b7e279ac6113ac1e095e6dacdccf8dfce48958cab727e7170e75d65a446690616dcf4f4c6d9fd37c26a2972f861d9c2166693b7f:
------
------
 > [10/26] RUN env     CC=arm-linux-gnueabi-gcc-9 CFLAGS="-march=armv7-a"     CXX=arm-linux-gnueabi-g++-9 CXXFLAGS="-march=armv7-a"     bash musl.sh armv7 &&     env     CC=riscv64-linux-gnu-gcc-11     CXX=riscv64-linux-gnu-g++-11     bash musl.sh riscv64gc &&     rm -rf /build/*:
---
  80 | >>>     bash musl.sh riscv64gc && \
  81 | >>>     rm -rf /build/*
  82 |     
--------------------
ERROR: failed to solve: process "/bin/sh -c env     CC=arm-linux-gnueabi-gcc-9 CFLAGS=\"-march=armv7-a\"     CXX=arm-linux-gnueabi-g++-9 CXXFLAGS=\"-march=armv7-a\"     bash musl.sh armv7 &&     env     CC=riscv64-linux-gnu-gcc-11     CXX=riscv64-linux-gnu-g++-11     bash musl.sh riscv64gc &&     rm -rf /build/*" did not complete successfully: exit code: 2
#0 building with "charming_babbage" instance using docker-container driver

#1 [internal] load build definition from Dockerfile
#1 transferring dockerfile: 7.27kB done

@bors
Copy link
Collaborator

bors commented Jan 12, 2025

💔 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 12, 2025
@jhpratt jhpratt closed this Jan 12, 2025
@jhpratt jhpratt deleted the rollup-zeyd0r8 branch January 12, 2025 03:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@jhpratt @bors @rust-log-analyzer @rustbot @asomers @kadiwa4 @yotamofek @lolbinarycat @steffahn