Skip to content

[beta] backports #138525

New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom
Merged
merged 10 commits into from
Mar 16, 2025
Merged

[beta] backports #138525

merged 10 commits into from
Mar 16, 2025

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Mar 15, 2025

r? cuviper

ChrisDenton and others added 10 commits March 14, 2025 18:17
@ChrisDenton @cuviper
Windows: Use MoveFileEx by default in fs:rename
882139c 
(cherry picked from commit 0dfe2ae)
@ChrisDenton @cuviper
Return OutOfMemoryError and update docs
9b20ca1 
(cherry picked from commit 3cb53df)
@RalfJung @cuviper
rustdoc: disable forbidden #[target_feature] check
10d5f67 
(cherry picked from commit b6f2240)
@RalfJung @cuviper
also fix potential issues with mixed stable/unstable target features …
17d569c 
…in rustdoc

(cherry picked from commit 039af88)
@RalfJung @cuviper
add test
871f01d 
(cherry picked from commit dc04c0c)
@RalfJung @cuviper
also skip abi_required_features check in rustdoc
6f5cf7d 
(cherry picked from commit 4c939db)
@notriddle @cuviper
doctests: fix merging on stable
6416d20 
Fixes rust-lang#137898

The generated multi-test harness relies on nightly-only APIs,
so the only way to run it on stable is to enable them. Since
tests that use crate attrs don't be merged, there's no way to use
nightly-only features on it anyway.

(cherry picked from commit 5d6eeea)
@notriddle @cuviper
doctests: build test bundle and harness separately
ad393e3 
This prevents the included test case from getting at nightly-only
features when run on stable. The harness builds with
RUSTC_BOOTSTRAP, but the bundle doesn't.

(cherry picked from commit 9cf531d)
@compiler-errors @cuviper
Revert "Rollup merge of rust-lang#136274 - compiler-errors:sized-wf, …
4d1e502 
…r=lcnr"

This reverts commit a8ecb79, reversing
changes made to 40c4e05.

(cherry picked from commit 9ea587e)
@compiler-errors @cuviper
Fix revert fallout
ea14c4a 
(cherry picked from commit 81d6660)
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs A-rustdoc-json Area: Rustdoc JSON backend O-windows Operating system: Windows 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-libs Relevant to the library 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Mar 15, 2025
@cuviper
Copy link
Member Author

cuviper commented Mar 15, 2025

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Mar 15, 2025

📌 Commit ea14c4a has been approved by cuviper

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 Mar 15, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 16, 2025
@bors
Auto merge of rust-lang#138525 - cuviper:beta-next, r=cuviper
cb421c7 
[beta] backports

- Windows: Fix error in `fs::rename` on Windows 1607 rust-lang#137528
- rustdoc: when merging target features, keep the highest stability rust-lang#137632
- doctests: fix merging on stable rust-lang#137899
- Revert wf sized check on beta rust-lang#138122

r? cuviper
@bors
Copy link
Collaborator

bors commented Mar 16, 2025

⌛ Testing commit ea14c4a with merge cb421c7...

@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
Collaborator

bors commented Mar 16, 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 Mar 16, 2025
@cuviper
Copy link
Member Author

cuviper commented Mar 16, 2025

dead runner?

@bors retry

@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 Mar 16, 2025
@jieyouxu
Copy link
Member

@bors p=10 (rollup scheduling)

@jieyouxu
Copy link
Member

GitHub Actions 474 lost communication with the server.

Poor runner 474

@bors
Copy link
Collaborator

bors commented Mar 16, 2025

⌛ Testing commit ea14c4a with merge 8c7969a...

@bors
Copy link
Collaborator

bors commented Mar 16, 2025

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 8c7969a to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 16, 2025
@bors bors merged commit 8c7969a into rust-lang:beta Mar 16, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Mar 16, 2025
This was referenced Mar 17, 2025
Closed
Closed
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@cuviper cuviper

Labels
A-run-make Area: port run-make Makefiles to rmake.rs A-rustdoc-json Area: Rustdoc JSON backend merged-by-bors This PR was explicitly merged by bors. O-windows Operating system: Windows S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
Projects
None yet
Milestone
1.86.0
Development

Successfully merging this pull request may close these issues.
9 participants
@cuviper @bors @rust-log-analyzer @jieyouxu @rustbot @ChrisDenton @RalfJung @notriddle @compiler-errors