diff options
| author | bors <bors@rust-lang.org> | 2025-04-04 08:52:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-04 08:52:02 +0000 |
| commit | a4166dabaae56ab0d35a7825c3e7008778eacf34 (patch) | |
| tree | 1fab237d13af76c2ac8016ce6e216ee71afbe06b /compiler/rustc_target/src/spec/json.rs | |
| parent | f174fd716a429fa17eb1e98ba4e382f09312f8ad (diff) | |
| parent | 0a9eae161b1aa6097a0f02b6ad8dea48ae534e30 (diff) | |
| download | rust-a4166dabaae56ab0d35a7825c3e7008778eacf34.tar.gz rust-a4166dabaae56ab0d35a7825c3e7008778eacf34.zip | |
Auto merge of #139354 - matthiaskrgr:rollup-04lgx23, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #138949 (Rename `is_like_osx` to `is_like_darwin`) - #139295 (Remove creation of duplicate `AnonPipe`) - #139313 (Deduplicate some `rustc_middle` function bodies by calling the `rustc_type_ir` equivalent) - #139317 (compiletest: Encapsulate all of the code that touches libtest) - #139322 (Add helper function for checking LLD usage to `run-make-support`) - #139335 (Pass correct param-env to `error_implies`) - #139342 (Add a mailmap entry for myself) - #139349 (adt_destructor: sanity-check returned item) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_target/src/spec/json.rs')
| -rw-r--r-- | compiler/rustc_target/src/spec/json.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_target/src/spec/json.rs b/compiler/rustc_target/src/spec/json.rs index 4b6de5e18f5..be71da76b4a 100644 --- a/compiler/rustc_target/src/spec/json.rs +++ b/compiler/rustc_target/src/spec/json.rs @@ -598,7 +598,7 @@ impl Target { key!(families, target_families); key!(abi_return_struct_as_int, bool); key!(is_like_aix, bool); - key!(is_like_osx, bool); + key!(is_like_darwin, bool); key!(is_like_solaris, bool); key!(is_like_windows, bool); key!(is_like_msvc, bool); @@ -777,7 +777,7 @@ impl ToJson for Target { target_option_val!(families, "target-family"); target_option_val!(abi_return_struct_as_int); target_option_val!(is_like_aix); - target_option_val!(is_like_osx); + target_option_val!(is_like_darwin); target_option_val!(is_like_solaris); target_option_val!(is_like_windows); target_option_val!(is_like_msvc); |