Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 8 pull requests #127898

Merged
merged 20 commits into from
Jul 18, 2024
Merged

Rollup of 8 pull requests #127898

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
538b31e
Make language around `ToOwned` for `BorrowedFd` more precise
tbu- Jun 28, 2024
2162f3f
Mention how you can go from `BorrowedFd` to `OwnedFd` and back
tbu- Jun 28, 2024
a651050
lift_to_tcx -> lift_to_interner
compiler-errors Jul 16, 2024
8d90f44
tcx -> cx in rustc_type_ir
compiler-errors Jul 16, 2024
0b5ce54
Fix relations
compiler-errors Jul 16, 2024
b84e2b7
Put the dots back
compiler-errors Jul 15, 2024
a9e1466
Add `llvm_components_contain` to `run-make-support`
Rejyr Jul 15, 2024
a8b6e3f
Migrate `atomic-lock-free` to `rmake`
Rejyr Jul 15, 2024
e38032f
Fix associated item removal suggestion
estebank Jul 9, 2024
8eb5185
Accurate `use` rename suggestion span
estebank Jul 10, 2024
be9d961
More accurate span for type parameter suggestion
estebank Jul 10, 2024
f6c4679
More accurate span for anonymous argument suggestion
estebank Jul 10, 2024
3aafbd2
Rollup merge of #127077 - tbu-:pr_doc_fd_to_owned, r=workingjubilee
matthiaskrgr Jul 18, 2024
97d5edf
Rollup merge of #127783 - compiler-errors:rtn-pretty, r=fee1-dead
matthiaskrgr Jul 18, 2024
2013bf9
Rollup merge of #127787 - Rejyr:migrate-atomic-lock-free-rmake, r=jie…
matthiaskrgr Jul 18, 2024
b2b14de
Rollup merge of #127810 - compiler-errors:less-tcx, r=lcnr
matthiaskrgr Jul 18, 2024
a13d7db
Rollup merge of #127878 - estebank:assoc-item-removal, r=fmease
matthiaskrgr Jul 18, 2024
b52883d
Rollup merge of #127886 - estebank:as-rename-suggestion, r=compiler-e…
matthiaskrgr Jul 18, 2024
d78be31
Rollup merge of #127888 - estebank:type-param-sugg, r=compiler-errors
matthiaskrgr Jul 18, 2024
77e5bbf
Rollup merge of #127889 - estebank:anon-arg-sugg, r=compiler-errors
matthiaskrgr Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add llvm_components_contain to run-make-support
  • Loading branch information
@Rejyr
Rejyr committed Jul 17, 2024
commit a9e14668d62b294d8394b7aae08cf552ba2d684e
2 changes: 1 addition & 1 deletion src/tools/run-make-support/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ pub use env::{env_var, env_var_os};
pub use run::{cmd, run, run_fail, run_with_args};

/// Helpers for checking target information.
pub use targets::{is_darwin, is_msvc, is_windows, target, uname};
pub use targets::{is_darwin, is_msvc, is_windows, llvm_components_contain, target, uname};

/// Helpers for building names of output artifacts that are potentially target-specific.
pub use artifact_names::{
Expand Down
7 changes: 7 additions & 0 deletions src/tools/run-make-support/src/targets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ pub fn is_darwin() -> bool {
target().contains("darwin")
}

/// Check if `component` is within `LLVM_COMPONENTS`
#[must_use]
pub fn llvm_components_contain(component: &str) -> bool {
// `LLVM_COMPONENTS` is a space-separated list of words
env_var("LLVM_COMPONENTS").split_whitespace().find(|s| s == &component).is_some()
}

/// Run `uname`. This assumes that `uname` is available on the platform!
#[track_caller]
#[must_use]
Expand Down