Skip to content

Commit d7a6a71

Browse files
authored
Rollup merge of #138949 - madsmtm:rename-to-darwin, r=WaffleLapkin
Rename `is_like_osx` to `is_like_darwin` Replace `is_like_osx` with `is_like_darwin`, which more closely describes reality (OS X is the pre-2016 name for macOS, and is by now quite outdated; Darwin is the overall name for the OS underlying Apple's macOS, iOS, etc.). ``@rustbot`` label O-apple r? compiler
2 parents 625b800 + c56c2b7 commit d7a6a71

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Diff for: src/abi/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ pub(crate) fn codegen_terminator_call<'tcx>(
641641
.flat_map(|arg_abi| arg_abi.get_abi_param(fx.tcx).into_iter()),
642642
);
643643

644-
if fx.tcx.sess.target.is_like_osx && fx.tcx.sess.target.arch == "aarch64" {
644+
if fx.tcx.sess.target.is_like_darwin && fx.tcx.sess.target.arch == "aarch64" {
645645
// Add any padding arguments needed for Apple AArch64.
646646
// There's no need to pad the argument list unless variadic arguments are actually being
647647
// passed.

Diff for: src/constant.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ fn define_all_allocs(tcx: TyCtxt<'_>, module: &mut dyn Module, cx: &mut Constant
391391
data.set_align(alloc.align.bytes());
392392

393393
if let Some(section_name) = section_name {
394-
let (segment_name, section_name) = if tcx.sess.target.is_like_osx {
394+
let (segment_name, section_name) = if tcx.sess.target.is_like_darwin {
395395
// See https://github.com/llvm/llvm-project/blob/main/llvm/lib/MC/MCSectionMachO.cpp
396396
let mut parts = section_name.as_str().split(',');
397397
let Some(segment_name) = parts.next() else {

Diff for: src/debuginfo/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ impl DebugContext {
5858
// FIXME this should be configurable
5959
// macOS doesn't seem to support DWARF > 3
6060
// 5 version is required for md5 file hash
61-
version: if tcx.sess.target.is_like_osx {
61+
version: if tcx.sess.target.is_like_darwin {
6262
3
6363
} else {
6464
// FIXME change to version 5 once the gdb and lldb shipping with the latest debian

0 commit comments

Comments
 (0)