Rollup of 6 pull requests#153448
Closed
JonathanBrouwer wants to merge 13 commits intorust-lang:mainfrom
Closed
Conversation
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
rustbot
added
A-LLVM
Contributor
Author
|
@bors r+ rollup=never p=5 |
Contributor
rust-bors
bot
added
S-waiting-on-bors
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
7 participants
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.
Successful merges:
const_lit_matches_tycheck literal suffixes for exact type match #152906 (Makeconst_lit_matches_tycheck literal suffixes for exact type match)r? @ghost
Create a similar rollup