-
Notifications
You must be signed in to change notification settings - Fork 13.2k
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
[stable] Release 1.85.1 #138521
Conversation
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 4c939db)
@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: x86_64-rust-for-linux
There was a problem hiding this 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
// 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. |
There was a problem hiding this comment.
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...
This comment has been minimized.
This comment has been minimized.
💔 Test failed - checks-actions |
This comment has been minimized.
This comment has been minimized.
💔 Test failed - checks-actions |
@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
This comment has been minimized.
This comment has been minimized.
💔 Test failed - checks-actions |
(cherry picked from commit e3117e6)
@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
☀️ Try build successful - checks-actions |
There was a problem hiding this 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
This PR modifies If appropriate, please update Some changes occurred in compiler/rustc_codegen_ssa This PR modifies cc @jieyouxu |
@bors r+ rollup=never p=10 |
☀️ Test successful - checks-actions |
target_feature
checks when generating docs.std::fs::rename
on Windows 1607.cc
to fix custom targets.Added backports to fix CI:
cc @rust-lang/release
r? cuviper