Skip to content
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.

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

[stable] Release 1.85.1 #138521

Draft
wants to merge 14 commits into
base: stable
Choose a base branch
from
Draft

[stable] Release 1.85.1 #138521

wants to merge 14 commits into from

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Mar 14, 2025

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

onur-ozkan and others added 12 commits March 12, 2025 12:48
Signed-off-by: onur-ozkan <[email protected]>
(cherry picked from commit d2203ad)
Signed-off-by: onur-ozkan <[email protected]>
(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
Contributor

bors commented Mar 14, 2025

⌛ Trying commit eb5c32d with merge 59f10477231a733b145053b6babc11a323283ac6...

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
Contributor

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
@ChrisDenton
Copy link
Member

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
Copy link
Member Author

cuviper commented Mar 15, 2025

@bors try

@bors
Copy link
Contributor

bors commented Mar 15, 2025

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

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: x86_64-rust-for-linux
@cuviper
Copy link
Member Author

cuviper commented Mar 15, 2025

Oh, I should also:

@rustbot ping relnotes-interest-group

@rustbot
Copy link
Collaborator

rustbot commented Mar 15, 2025

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

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

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
Contributor

bors commented Mar 15, 2025

⌛ Trying commit 0e8fd2d with merge d8350f1...

@rust-log-analyzer
Copy link
Collaborator

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
Copy link
Contributor

bors commented Mar 15, 2025

💔 Test failed - checks-actions

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs O-windows Operating system: Windows S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants