Use shlex instead of shell-words#153436
Merged
rust-bors[bot] merged 2 commits intorust-lang:mainfrom Mar 5, 2026
Merged
Conversation
The build script here wants to sniff for `-stdlib=libc++` but was missing the leading dashes. We caught this on the Rust/LLVM HEADs builder which also uses libc++.
Collaborator
|
The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging. |
Collaborator
|
|
Member
|
Thanks! @bors r+ |
Contributor
rust-bors
bot
added
the
S-waiting-on-bors
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Mar 5, 2026
…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
This was referenced Mar 5, 2026
rust-bors bot
pushed a commit
that referenced
this pull request
Mar 5, 2026
…uwer Rollup of 9 pull requests Successful merges: - #153399 (constify `Vec::{into, from}_raw_parts{_in|_alloc}`) - #153436 (Use shlex instead of shell-words) - #150845 (bootstrap: minimal fix for ./x install src with build.docs = false) - #152906 (Make `const_lit_matches_ty` check literal suffixes for exact type match) - #153378 (Rename `QueryCache::iter` to `for_each`) - #153386 (Minor query cleanups) - #153422 (Add a comment explaining the 'tcx lifetime.) - #153435 (Fix obtaining def_id from unresolved segment) - #153453 (Fix ICEs due to incomplete typechecking on struct literals with syntax errors.)
rust-timer
added a commit
that referenced
this pull request
Mar 5, 2026
Rollup merge of #153436 - eggyal:shlex-not-shell_words, r=ChrisDenton Use shlex instead of shell-words In #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) #153419, which would otherwise conflict. [`cc`]: https://crates.io/crates/cc [noted by bjorn3]: #152712 (comment) [`shell-words`]: https://crates.io/crates/shell-words [`shlex`]: https://crates.io/crates/shlex r? ChrisDenton
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
4 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.
In #152712, the
shell-wordscrate was introduced as a new dependency ofrustc_llvmin order for its build script to parse the output ofllvm-config --quote-pathsand thereby handle paths containing whitespace; however, as noted by bjorn3, that build script already transitively depends upon theshlexcrate (via thecccrate) which provides similar functionality.This patch is based off (the already-approved) #153419, which would otherwise conflict.
r? ChrisDenton