Skip to content

[beta-1.100] fix: check crate type when pruning -L paths - #17590

Merged
Muscraft merged 3 commits into
rust-lang:rust-1.100.0from
weihanglo:rust-1.100-backport
Oct 14, 2026
Merged

Muscraft merged 3 commits into
rust-lang:rust-1.100.0from
weihanglo:rust-1.100-backport

Conversation

@weihanglo

@weihanglo weihanglo commented Oct 14, 2026 •

Copy link
Copy Markdown
Member

Beta backports

In order to make CI pass, the following PRs are also cherry-picked:

During manifest parsing,
explicit `crate-type` wins over `proc-macro=true` when invoking rustc,
though `Target::proc_macro` still returns true for such a library.
Since rust-lang#17410,
our `-L` dependency walk stops at proc-macro targets,
so dependencies of that "ordinary" rlib were no longer searchable.
And then we got E0463

This patch checks crate type rustc actually set
rather than the `target.proc-macro` flag.

The scope of this fix is intentionally kept minimal for backport.

Fixes rust-lang/rust#164086

See also rust-lang#17579
@rustbot rustbot added A-build-execution Area: anything dealing with executing the compiler S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 14, 2026
@rustbot

rustbot commented Oct 14, 2026

Copy link
Copy Markdown
Collaborator

r? @epage

rustbot has assigned @epage.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: @Muscraft, @epage, @weihanglo
  • @Muscraft, @epage, @weihanglo expanded to Muscraft, epage, weihanglo
  • Random selection from Muscraft, epage

@rustbot

rustbot commented Oct 14, 2026

Copy link
Copy Markdown
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.100.0. Please double check that you specified the right target!

Our doc-merge rustdoc invocation didn't pass `--edition`
hence affected by rust-lang/rust#163795
@Muscraft
Muscraft merged commit ec94eef into rust-lang:rust-1.100.0 Oct 14, 2026
28 checks passed
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 14, 2026
@weihanglo
weihanglo deleted the rust-1.100-backport branch October 14, 2026 19:04
rust-bors Bot pushed a commit to rust-lang/rust that referenced this pull request Oct 15, 2026
[beta-1.100] Update cargo submodule

1 commits in 7552a885e7c68a5b5a3dfc5c158059983ac3efb7..ec94eef9b5d25d89158c02a449b7d838a5ad3f43
2026-09-29 18:08:50 -0400 to 2026-10-14 12:58:33 -0600
- [beta-1.100] fix: check crate type when pruning `-L` paths (rust-lang/cargo#17590)

Fixes #164086
rust-bors Bot pushed a commit to rust-lang/rust that referenced this pull request Oct 15, 2026
[beta-1.100] Update cargo submodule

1 commits in 7552a885e7c68a5b5a3dfc5c158059983ac3efb7..ec94eef9b5d25d89158c02a449b7d838a5ad3f43
2026-09-29 18:08:50 -0400 to 2026-10-14 12:58:33 -0600
- [beta-1.100] fix: check crate type when pruning `-L` paths (rust-lang/cargo#17590)

Fixes #164086
rust-bors Bot pushed a commit to rust-lang/rust that referenced this pull request Oct 17, 2026
[beta-1.100] Update cargo submodule

2 commits in 7552a885e7c68a5b5a3dfc5c158059983ac3efb7..72b77b8d94ec3e2fca533266d88561e527aabe25
2026-09-29 18:08:50 -0400 to 2026-10-17 10:39:00 -0400
- [beta 1.100] fix(config): Apply dotted tuple support for rustflags (rust-lang/cargo#17605)
- [beta-1.100] fix: check crate type when pruning `-L` paths (rust-lang/cargo#17590)


Fixes #164086
@rustbot rustbot added this to the 1.100.0 milestone Oct 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-build-execution Area: anything dealing with executing the compiler Command-doc

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants