[beta-1.99] backport 17401 and 17366 - #17403
Merged
Merged
Conversation
Prepares workspace remap for emitting multiple rules.
This is effectively `library/=<to>/library` and `compiler/=<to>/compiler` in rustc bootstrap, when `__CARGO_RUSTC_BOOTSTRAP_WS_REMAP` is set. This isn't needed for normal cases because relative member paths are exactly what users want. See <rust-lang/rust#161049 (comment)>
weihanglo
force-pushed
the
beta-1.99-backport
branch
from
August 28, 2026 00:06
c0bb973 to
a5aca4b
Compare
weihanglo
marked this pull request as ready for review
August 28, 2026 00:07
Collaborator
|
r? @epage rustbot has assigned @epage. Use Why was this reviewer chosen?The reviewer was selected based on:
|
Collaborator
|
This reverts commit 4c20b84.
This reverts commit 9f3c326.
This reverts commit 936fb92.
See <https://github.com/rust-lang/cargo/actions/runs/32992508559/job/98253339881> ``` warning: redundant explicit link target --> crates/home/src/lib.rs:81:42 | 81 | /// For more details, see [`cargo_home`](fn.cargo_home.html). | ------------ ^^^^^^^^^^^^^^^^^^ explicit target is redundant | | | because label contains path that resolves to same destination | = note: when a link's destination is not specified, the label is used to resolve intra-doc links = note: `#[warn(rustdoc::redundant_explicit_links)]` on by default help: remove explicit link target | 81 - /// For more details, see [`cargo_home`](fn.cargo_home.html). 81 + /// For more details, see [`cargo_home`]. | warning: redundant explicit link target --> crates/home/src/lib.rs:118:43 | 118 | /// For more details, see [`rustup_home`](fn.rustup_home.html). | ------------- ^^^^^^^^^^^^^^^^^^^ explicit target is redundant | | | because label contains path that resolves to same destination | = note: when a link's destination is not specified, the label is used to resolve intra-doc links help: remove explicit link target | 118 - /// For more details, see [`rustup_home`](fn.rustup_home.html). 118 + /// For more details, see [`rustup_home`]. | error: `home` (lib doc) generated 2 warnings ```
next trait resolver might have bugs dealing with it, but anyway we care less about intra doclinks for resolver-tests, and it anyway builds in clippy jobs.
weihanglo
force-pushed
the
beta-1.99-backport
branch
from
August 28, 2026 00:28
3f6a0cd to
705ebd0
Compare
epage
approved these changes
Aug 28, 2026
rust-bors Bot
pushed a commit
to rust-lang/rust
that referenced
this pull request
Aug 28, 2026
[beta-1.99] Update cargo submodule backport 1 commits in eb98b54bc9f3c74519f43d066cb3fd02ebc88df0..5f94df4789f005f9a352888e8355ffc645b7ed0e 2026-08-11 16:00:29 +0000 to 2026-08-27 20:07:23 -0500 - [beta-1.99] backport 17401 and 17366 (rust-lang/cargo#17403)
rust-bors Bot
pushed a commit
to rust-lang/rust
that referenced
this pull request
Aug 28, 2026
[beta-1.99] Update cargo submodule backport 1 commits in eb98b54bc9f3c74519f43d066cb3fd02ebc88df0..5f94df4789f005f9a352888e8355ffc645b7ed0e 2026-08-11 16:00:29 +0000 to 2026-08-27 20:07:23 -0500 - [beta-1.99] backport 17401 and 17366 (rust-lang/cargo#17403)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Beta backports
In order to make CI pass, the following PRs are also cherry-picked: