Skip to content

Rollup of 6 pull requests - #153448

Closed
JonathanBrouwer wants to merge 13 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-vS0O4Er
Closed

Rollup of 6 pull requests#153448
JonathanBrouwer wants to merge 13 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-vS0O4Er

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

lapla-cogito and others added 13 commits March 1, 2026 12:47
It has no effect. Presumably at some point in the past there were
generics involved here?
When running the `install src` command I'm seeing failures as the
`builder.doc_out(host)` directory does not exist. This is because
`match_paths_to_steps_and_run()` doesn't actually build any
documentation as the `paths.is_empty()` causes an early return. This
results in install failures as the `*/doc` src directory doesn't exist.

This patch ensures that the builder.doc_out(host) directory exists.

This fixes installing the Rust source when `build.docs = false`.

This fixes installing the Rust source code in OpenEmbedded.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Jieyou Xu <jieyouxu@outlook.com>
…risDenton

Use shlex instead of shell-words

In rust-lang#152712, the [`shell-words`] crate was introduced as a new dependency of `rustc_llvm` in order for its build script to parse the output of `llvm-config --quote-paths` and thereby handle paths containing whitespace; however, as [noted by bjorn3], that build script already transitively depends upon the [`shlex`] crate (via the [`cc`] crate) which provides similar functionality.

This patch is based off (the already-approved) rust-lang#153419, which would otherwise conflict.

[`cc`]: https://crates.io/crates/cc
[noted by bjorn3]: rust-lang#152712 (comment)
[`shell-words`]: https://crates.io/crates/shell-words
[`shlex`]: https://crates.io/crates/shlex

r? ChrisDenton
…p, r=jieyouxu

bootstrap: minimal fix for ./x install src with build.docs = false

`run_default_doc_steps()` is called to ensure the documentation is built by `Docs::run()` and it should build the documentation if it isn't already built.

When running the `install src` command I'm seeing failures as the `builder.doc_out(host)` directory does not exist. This is because `match_paths_to_steps_and_run()` doesn't actually build any documentation as the `paths.is_empty()` causes an early return. This results in install failures as the `*/doc` src directory doesn't exist.

This patch passes the paths to `run_step_descriptions()` when building documentation to ensure it is correctly built.

This fixes installing the Rust source code in OpenEmbedded.
Make `const_lit_matches_ty` check literal suffixes for exact type match

`const_lit_matches_ty` ignored literal suffixes. This let the `try_lower_anon_const_lit` fast path produce a mistyped `ty::Const::Value`, bypassing the type mismatch error that typeck would otherwise report.
…r=petrochenkov

Minor query cleanups

Details in individual commits.

r? @petrochenkov
Add a comment explaining the 'tcx lifetime.

I wrote this after thinking about where the `'tcx` lifetime actually comes from.

r? @bjorn3
…e, r=petrochenkov

Fix obtaining def_id from unresolved segment

This PR fixes ICE when trying to obtain `def_id` from an unresolved segment, part of rust-lang#118212, fixes rust-lang#153389.

r? @petrochenkov
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Mar 5, 2026
@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-tidy Area: The tidy tool 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. labels Mar 5, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ rollup=never p=5

@rust-bors

rust-bors Bot commented Mar 5, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 054efa1 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 5, 2026
@JonathanBrouwer
JonathanBrouwer deleted the rollup-vS0O4Er branch August 21, 2026 08:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-tidy Area: The tidy tool rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants