[stable] Release 1.85.1 #138521

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

Fix the doctest-merging feature of the 2024 Edition.
Relax some target_feature checks when generating docs.
- 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.
Downgrade bootstrap cc to fix custom targets.
Skip submodule updates when building Rust from a source tarball.

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

Signed-off-by: onur-ozkan <[email protected]> (cherry picked from commit d2203ad)

Signed-off-by: onur-ozkan <[email protected]> (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 59f10477231a733b145053b6babc11a323283ac6...

[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

ChrisDenton · 2025-03-14T23:35:48Z

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

It seems you need the first at least.

(cherry picked from commit 25617c7)

cuviper · 2025-03-15T00:48:52Z

@bors try

bors · 2025-03-15T00:50:06Z

⌛ Trying commit 3c37eba with merge 13dd86bdb4ff7230da36e5111ccfbb0fe8797672...

[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

cuviper · 2025-03-15T00:52:46Z

Oh, I should also:

@rustbot ping relnotes-interest-group

rustbot · 2025-03-15T00:52:48Z

Hi relnotes-interest-group, this PR adds release notes. Could you review this PR
if you have time? Thanks <3

cc @alex-semenyuk @jieyouxu @joshtriplett @lcnr @traviscross

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

rust-log-analyzer · 2025-03-15T02:44:32Z

The job x86_64-rust-for-linux failed! Check out the build log: (web) (plain)

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

file:.git/config remote.origin.url=https://github.com/rust-lang-ci/rust
file:.git/config remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
file:.git/config gc.auto=0
file:.git/config http.https://github.com/.extraheader=AUTHORIZATION: basic ***
file:.git/config branch.try.remote=origin
file:.git/config branch.try.merge=refs/heads/try
file:.git/config submodule.library/backtrace.active=true
file:.git/config submodule.library/backtrace.url=https://github.com/rust-lang/backtrace-rs.git
file:.git/config submodule.library/stdarch.active=true
file:.git/config submodule.library/stdarch.url=https://github.com/rust-lang/stdarch.git
file:.git/config submodule.src/doc/book.active=true
---

This is usually done by running one of the following (note the leading DOT):
. "/cargo/env"            # For sh/bash/zsh/ash/dash/pdksh
source "/cargo/env.fish"  # For fish
source "/cargo/env.nu"    # For nushell
info: profile set to 'default'
info: default host triple is x86_64-unknown-linux-gnu
info: skipping toolchain installation
info: default toolchain set to 'local'
hint: Using 'master' as the name for the initial branch. This default branch name
---
error: toolchain options are ignored for a custom toolchain (local)
error: could not compile `proc-macro2` (build script)

Caused by:
  process didn't exit successfully: `rustc --crate-name build_script_build --edition=2021 /cargo/registry/src/index.crates.io-6f17d22bba15001f/proc-macro2-1.0.94/build.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,link -C embed-bitcode=no -C debug-assertions=off --cfg 'feature="default"' --cfg 'feature="proc-macro"' --check-cfg 'cfg(docsrs)' --check-cfg 'cfg(feature, values("default", "nightly", "proc-macro", "span-locations"))' -C metadata=05c59632ae767799 -C extra-filename=-05c59632ae767799 --out-dir /tmp/cargo-installM7b3Xa/release/build/proc-macro2-05c59632ae767799 -C strip=debuginfo -L dependency=/tmp/cargo-installM7b3Xa/release/deps --cap-lints allow` (exit status: 1)
warning: build failed, waiting for other jobs to finish...
error: failed to compile `bindgen-cli v0.65.1`, intermediate artifacts can be found at `/tmp/cargo-installM7b3Xa`.
To reuse those artifacts with a future compilation, set the environment variable `CARGO_TARGET_DIR` to that path.
  local time: Sat Mar 15 02:44:19 UTC 2025
  network time: Sat, 15 Mar 2025 02:44:20 GMT
##[error]Process completed with exit code 101.
Post job cleanup.

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

💔 Test failed - checks-actions

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

skip submodule updating logics on tarballs

a28fc0b

Signed-off-by: onur-ozkan <[email protected]> (cherry picked from commit d2203ad)

downgrade bootstrap cc

a280bac

Signed-off-by: onur-ozkan <[email protected]> (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

Remove Win SDK 10.0.26100.0 from CI

3c37eba

(cherry picked from commit 25617c7)

This comment has been minimized.

Sign in to view

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

0e8fd2d

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[stable] Release 1.85.1 #138521

[stable] Release 1.85.1 #138521

cuviper commented Mar 14, 2025 •

edited

Loading

cuviper commented Mar 14, 2025

cuviper commented Mar 14, 2025

bors commented Mar 14, 2025

workingjubilee left a comment

workingjubilee Mar 14, 2025

This comment has been minimized.

bors commented Mar 14, 2025

ChrisDenton commented Mar 14, 2025

cuviper commented Mar 15, 2025

bors commented Mar 15, 2025

cuviper commented Mar 15, 2025

rustbot commented Mar 15, 2025

This comment has been minimized.

bors commented Mar 15, 2025

cuviper commented Mar 15, 2025

bors commented Mar 15, 2025

rust-log-analyzer commented Mar 15, 2025

bors commented Mar 15, 2025

[stable] Release 1.85.1 #138521

Are you sure you want to change the base?

[stable] Release 1.85.1 #138521

Conversation

cuviper commented Mar 14, 2025 • edited Loading

cuviper commented Mar 14, 2025

cuviper commented Mar 14, 2025

bors commented Mar 14, 2025

workingjubilee left a comment

Choose a reason for hiding this comment

workingjubilee Mar 14, 2025

Choose a reason for hiding this comment

This comment has been minimized.

bors commented Mar 14, 2025

ChrisDenton commented Mar 14, 2025

cuviper commented Mar 15, 2025

bors commented Mar 15, 2025

cuviper commented Mar 15, 2025

rustbot commented Mar 15, 2025

This comment has been minimized.

bors commented Mar 15, 2025

cuviper commented Mar 15, 2025

bors commented Mar 15, 2025

rust-log-analyzer commented Mar 15, 2025

bors commented Mar 15, 2025

cuviper commented Mar 14, 2025 •

edited

Loading