[stable] Release 1.85.1 by cuviper · Pull Request #138521 · rust-lang/rust

cuviper · 2025-03-14T21:54:25Z

Added backports to fix CI:

Remove latest Windows SDK from 32-bit CI Remove latest Windows SDK from 32-bit CI #137753
Do not install rustup on Rust for Linux job Do not install rustup on Rust for Linux job #137947

cc @rust-lang/release
r? cuviper

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)

(cherry picked from commit 0dfe2ae)

(cherry picked from commit 3cb53df)

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 b6f2240)

…in rustdoc (cherry picked from commit 039af88)

(cherry picked from commit dc04c0c)

(cherry picked from commit 4c939db)

cuviper · 2025-03-14T22:06:17Z

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

cuviper · 2025-03-14T22:17:19Z

@bors try

bors · 2025-03-14T22:18:33Z

⌛ Trying commit eb5c32d with merge 59f1047...

[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

workingjubilee

reviewed the backport of #137632 and it seems correct

workingjubilee · 2025-03-14T22:29:59Z

compiler/rustc_codegen_ssa/src/target_features.rs

+                // 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.


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

bors · 2025-03-14T23:32:02Z

💔 Test failed - checks-actions

bors · 2025-03-15T01:19:23Z

💔 Test failed - checks-actions

cuviper · 2025-03-15T01:29:14Z

@bors try

[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 · 2025-03-15T01:30:26Z

⌛ Trying commit 0e8fd2d with merge d8350f1...

bors · 2025-03-15T02:45:03Z

💔 Test failed - checks-actions

(cherry picked from commit e3117e6)

cuviper · 2025-03-15T04:44:10Z

@bors try

bors · 2025-03-15T04:45:24Z

⌛ Trying commit c990a19 with merge bb3a07a...

[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 · 2025-03-15T06:41:27Z

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

jieyouxu

Thanks, relnotes look good

RELEASES.md

rustbot · 2025-03-15T14:51:51Z

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 · 2025-03-15T14:52:05Z

@bors r+ rollup=never p=10

bors · 2025-03-15T14:52:08Z

📌 Commit 4d11490 has been approved by cuviper

It is now in the queue for this repository.

bors · 2025-03-15T16:27:22Z

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

bors · 2025-03-15T20:12:09Z

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

onur-ozkan and others added 12 commits March 12, 2025 12:48

skip submodule updating logics on tarballs

a28fc0b

Signed-off-by: onur-ozkan <work@onurozkan.dev> (cherry picked from commit d2203ad)

downgrade bootstrap cc

a280bac

Signed-off-by: onur-ozkan <work@onurozkan.dev> (cherry picked from commit e4ca11f)

Windows: Use MoveFileEx by default in fs:rename

e616d37

(cherry picked from commit 0dfe2ae)

Return OutOfMemoryError and update docs

3aa36cf

(cherry picked from commit 3cb53df)

doctests: build test bundle and harness separately

23322f3

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)

Bless rustdoc-ui differences

eb2bae3

These changed in the stable backport because we don't have the rewording that came in rust-lang#133154.

rustdoc: disable forbidden #[target_feature] check

d4de520

(cherry picked from commit b6f2240)

also fix potential issues with mixed stable/unstable target features …

c13521b

…in rustdoc (cherry picked from commit 039af88)

add test

207a543

(cherry picked from commit dc04c0c)

also skip abi_required_features check in rustdoc

541b2c6

(cherry picked from commit 4c939db)

Release 1.85.1

eb5c32d

rustbot assigned cuviper Mar 14, 2025

workingjubilee approved these changes Mar 14, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

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

Use matrix.image, and i686-msvc isn't split here

0e8fd2d

This comment has been minimized.

Sign in to view

Do not use rustup to build Rust for Linux

c990a19

(cherry picked from commit e3117e6)

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

alex-semenyuk approved these changes Mar 15, 2025

View reviewed changes

jieyouxu approved these changes Mar 15, 2025

View reviewed changes

RELEASES.md Outdated Show resolved Hide resolved

Specify std:fs::rename in relnotes

4d11490

cuviper marked this pull request as ready for review March 15, 2025 14:51

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 added the merged-by-bors This PR was explicitly merged by bors. label Mar 15, 2025

bors merged commit 4eb1612 into rust-lang:stable Mar 15, 2025
7 checks passed

rustbot added this to the 1.85.1 milestone Mar 15, 2025

cuviper mentioned this pull request Mar 17, 2025

Backport: Merged doctests unused in stable edition 2024 #138418

Closed

4 tasks

cuviper deleted the stable-next branch June 23, 2025 17:07

Uh oh!

Conversation

cuviper commented Mar 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cuviper commented Mar 14, 2025

Uh oh!

cuviper commented Mar 14, 2025

Uh oh!

bors commented Mar 14, 2025

Uh oh!

workingjubilee left a comment

Choose a reason for hiding this comment

Uh oh!

workingjubilee Mar 14, 2025

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

bors commented Mar 14, 2025

Uh oh!

bors commented Mar 15, 2025

Uh oh!

cuviper commented Mar 15, 2025

Uh oh!

bors commented Mar 15, 2025

Uh oh!

This comment has been minimized.

bors commented Mar 15, 2025

Uh oh!

cuviper commented Mar 15, 2025

Uh oh!

bors commented Mar 15, 2025

Uh oh!

bors commented Mar 15, 2025

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rustbot commented Mar 15, 2025

Uh oh!

cuviper commented Mar 15, 2025

Uh oh!

bors commented Mar 15, 2025

Uh oh!

bors commented Mar 15, 2025

Uh oh!

bors commented Mar 15, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

cuviper commented Mar 14, 2025 •

edited

Loading