Skip to content

[stable] Release 1.85.1 #138521

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

Merged
merged 16 commits into from
Mar 15, 2025
Merged

[stable] Release 1.85.1 #138521

merged 16 commits into from
Mar 15, 2025

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Mar 14, 2025

onur-ozkan and others added 12 commits March 12, 2025 12:48
Signed-off-by: onur-ozkan <work@onurozkan.dev>
(cherry picked from commit d2203ad)
Signed-off-by: onur-ozkan <work@onurozkan.dev>
(cherry picked from commit e4ca11f)
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)
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)
These changed in the stable backport because we don't have the rewording
that came in rust-lang#133154.
(cherry picked from commit dc04c0c)
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs O-windows Operating system: Windows 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-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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Mar 14, 2025
@cuviper
Copy link
Member Author

cuviper commented Mar 14, 2025

We might also need #137753 and #137947 for external factors, as we did on beta.

@cuviper
Copy link
Member Author

cuviper commented Mar 14, 2025

@bors try

@bors
Copy link
Collaborator

bors commented Mar 14, 2025

⌛ Trying commit eb5c32d with merge 59f1047...

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 14, 2025
[stable] Release 1.85.1

- [Fix the doctest-merging feature of the 2024 Edition.](rust-lang#137899)
- [Relax some `target_feature` checks when generating docs.](rust-lang#137632)
  - DRAFT NOTE: this is not formally `stable-accepted` yet. It also required some fixup to deal with differences in the `Stability` system, but I think it should have the same effect, limited to `rustdoc` execution.
- [Fix errors in `fs::rename` on Windows 1607.](rust-lang#137528)
- [Downgrade bootstrap `cc` to fix custom targets.](rust-lang#137460)
- [Skip submodule updates when building Rust from a source tarball.](rust-lang#137338)

cc `@rust-lang/release`
r? cuviper

try-job: dist-x86_64-linux
try-job: dist-i686-msvc
try-job: x86_64-rust-for-linux
Copy link
Member

@workingjubilee workingjubilee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reviewed the backport of #137632 and it seems correct

Comment on lines 152 to 156
// HACK: rustdoc would like to pretend that we have all the target features, so we
// have to merge all the lists into one. The result has a "random" stability
// (depending on the order in which we consider features); all places that check
// target stability are expected to check `actually_rustdoc` and do nothing when
// that is set.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what an odd melange of hunks this winds up being...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Mar 14, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 14, 2025
@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Mar 15, 2025

💔 Test failed - checks-actions

@cuviper
Copy link
Member Author

cuviper commented Mar 15, 2025

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 15, 2025
[stable] Release 1.85.1

- [Fix the doctest-merging feature of the 2024 Edition.](rust-lang#137899)
- [Relax some `target_feature` checks when generating docs.](rust-lang#137632)
  - DRAFT NOTE: this is not formally `stable-accepted` yet. It also required some fixup to deal with differences in the `Stability` system, but I think it should have the same effect, limited to `rustdoc` execution.
- [Fix errors in `fs::rename` on Windows 1607.](rust-lang#137528)
- [Downgrade bootstrap `cc` to fix custom targets.](rust-lang#137460)
- [Skip submodule updates when building Rust from a source tarball.](rust-lang#137338)

cc `@rust-lang/release`
r? cuviper

try-job: dist-x86_64-linux
try-job: dist-i686-msvc
try-job: i686-msvc
try-job: x86_64-rust-for-linux
@bors
Copy link
Collaborator

bors commented Mar 15, 2025

⌛ Trying commit 0e8fd2d with merge d8350f1...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Mar 15, 2025

💔 Test failed - checks-actions

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Mar 15, 2025
@cuviper
Copy link
Member Author

cuviper commented Mar 15, 2025

@bors try

@bors
Copy link
Collaborator

bors commented Mar 15, 2025

⌛ Trying commit c990a19 with merge bb3a07a...

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 15, 2025
[stable] Release 1.85.1

- [Fix the doctest-merging feature of the 2024 Edition.](rust-lang#137899)
- [Relax some `target_feature` checks when generating docs.](rust-lang#137632)
  - DRAFT NOTE: this is not formally `stable-accepted` yet. It also required some fixup to deal with differences in the `Stability` system, but I think it should have the same effect, limited to `rustdoc` execution.
- [Fix errors in `fs::rename` on Windows 1607.](rust-lang#137528)
- [Downgrade bootstrap `cc` to fix custom targets.](rust-lang#137460)
- [Skip submodule updates when building Rust from a source tarball.](rust-lang#137338)

cc `@rust-lang/release`
r? cuviper

try-job: dist-x86_64-linux
try-job: dist-i686-msvc
try-job: i686-msvc
try-job: x86_64-rust-for-linux
@bors
Copy link
Collaborator

bors commented Mar 15, 2025

☀️ Try build successful - checks-actions
Build commit: bb3a07a (bb3a07a1f5569a1e68a466cad049e55a8b3d19ac)

Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, relnotes look good

@cuviper cuviper marked this pull request as ready for review March 15, 2025 14:51
@rustbot
Copy link
Collaborator

rustbot commented Mar 15, 2025

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

This PR modifies run-make tests.

cc @jieyouxu

@cuviper
Copy link
Member Author

cuviper commented Mar 15, 2025

@bors r+ rollup=never p=10

@bors
Copy link
Collaborator

bors commented Mar 15, 2025

📌 Commit 4d11490 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 15, 2025
@bors
Copy link
Collaborator

bors commented Mar 15, 2025

⌛ Testing commit 4d11490 with merge 4eb1612...

@bors
Copy link
Collaborator

bors commented Mar 15, 2025

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 4eb1612 to stable...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 15, 2025
@bors bors merged commit 4eb1612 into rust-lang:stable Mar 15, 2025
7 checks passed
@rustbot rustbot added this to the 1.85.1 milestone Mar 15, 2025
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc 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-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. 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.