mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-29 02:03:53 +00:00
Rollup merge of #130650 - BlackHoleFox:apple-target-desc-consistency, r=jieyouxu
Fixup Apple target's description strings Noticed this inconsistency in how the Apple target's had their new descriptions written while looking at https://github.com/rust-lang/rust/pull/130614, and figured it was easy enough to fixup shortly. I think prefixing every OS with `Apple` is clearer, especially for less known ones like `visionOS` and `watchOS`; so that's what was done here along with making the architecture names more consistent and then some other small tweaks. ~~r? `@thomcc~~` cc `@madsmtm`
This commit is contained in:
commit
2875d6f98e
@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
|
||||
Target {
|
||||
llvm_target,
|
||||
metadata: crate::spec::TargetMetadata {
|
||||
description: Some("ARM64 macOS (11.0+, Big Sur+)".into()),
|
||||
description: Some("ARM64 Apple macOS (11.0+, Big Sur+)".into()),
|
||||
tier: Some(1),
|
||||
host_tools: Some(true),
|
||||
std: Some(true),
|
||||
|
@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
|
||||
Target {
|
||||
llvm_target,
|
||||
metadata: crate::spec::TargetMetadata {
|
||||
description: Some("ARM64 iOS".into()),
|
||||
description: Some("ARM64 Apple iOS".into()),
|
||||
tier: Some(2),
|
||||
host_tools: Some(false),
|
||||
std: Some(true),
|
||||
|
@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
|
||||
Target {
|
||||
llvm_target,
|
||||
metadata: crate::spec::TargetMetadata {
|
||||
description: Some("Apple Catalyst on ARM64".into()),
|
||||
description: Some("ARM64 Apple Mac Catalyst".into()),
|
||||
tier: Some(2),
|
||||
host_tools: Some(false),
|
||||
std: Some(true),
|
||||
|
@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
|
||||
Target {
|
||||
llvm_target,
|
||||
metadata: crate::spec::TargetMetadata {
|
||||
description: Some("Apple iOS Simulator on ARM64".into()),
|
||||
description: Some("ARM64 Apple iOS Simulator".into()),
|
||||
tier: Some(2),
|
||||
host_tools: Some(false),
|
||||
std: Some(true),
|
||||
|
@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
|
||||
Target {
|
||||
llvm_target,
|
||||
metadata: crate::spec::TargetMetadata {
|
||||
description: Some("ARM64 tvOS".into()),
|
||||
description: Some("ARM64 Apple tvOS".into()),
|
||||
tier: Some(3),
|
||||
host_tools: Some(false),
|
||||
std: Some(true),
|
||||
|
@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
|
||||
Target {
|
||||
llvm_target,
|
||||
metadata: crate::spec::TargetMetadata {
|
||||
description: Some("ARM64 tvOS Simulator".into()),
|
||||
description: Some("ARM64 Apple tvOS Simulator".into()),
|
||||
tier: Some(3),
|
||||
host_tools: Some(false),
|
||||
std: Some(true),
|
||||
|
@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
|
||||
Target {
|
||||
llvm_target,
|
||||
metadata: crate::spec::TargetMetadata {
|
||||
description: Some("ARM64 Apple WatchOS".into()),
|
||||
description: Some("ARM64 Apple watchOS".into()),
|
||||
tier: Some(3),
|
||||
host_tools: Some(false),
|
||||
std: Some(true),
|
||||
|
@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
|
||||
Target {
|
||||
llvm_target,
|
||||
metadata: crate::spec::TargetMetadata {
|
||||
description: Some("ARM64 Apple WatchOS Simulator".into()),
|
||||
description: Some("ARM64 Apple watchOS Simulator".into()),
|
||||
tier: Some(3),
|
||||
host_tools: Some(false),
|
||||
std: Some(true),
|
||||
|
@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
|
||||
Target {
|
||||
llvm_target,
|
||||
metadata: crate::spec::TargetMetadata {
|
||||
description: Some("Arm Apple WatchOS 64-bit with 32-bit pointers".into()),
|
||||
description: Some("ARM64 Apple watchOS with 32-bit pointers".into()),
|
||||
tier: Some(3),
|
||||
host_tools: Some(false),
|
||||
std: Some(true),
|
||||
|
@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
|
||||
Target {
|
||||
llvm_target,
|
||||
metadata: crate::spec::TargetMetadata {
|
||||
description: Some("Armv7-A Apple-A6 Apple iOS".into()),
|
||||
description: Some("ARMv7-A Apple-A6 Apple iOS".into()),
|
||||
tier: Some(3),
|
||||
host_tools: Some(false),
|
||||
std: Some(true),
|
||||
|
@ -8,7 +8,7 @@ pub(crate) fn target() -> Target {
|
||||
Target {
|
||||
llvm_target,
|
||||
metadata: crate::spec::TargetMetadata {
|
||||
description: Some("32-bit x86 iOS".into()),
|
||||
description: Some("x86 Apple iOS Simulator".into()),
|
||||
tier: Some(3),
|
||||
host_tools: Some(false),
|
||||
std: Some(true),
|
||||
|
@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
|
||||
Target {
|
||||
llvm_target,
|
||||
metadata: crate::spec::TargetMetadata {
|
||||
description: Some("32-bit macOS (10.12+, Sierra+)".into()),
|
||||
description: Some("x86 Apple macOS (10.12+, Sierra+)".into()),
|
||||
tier: Some(3),
|
||||
host_tools: Some(true),
|
||||
std: Some(true),
|
||||
|
@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
|
||||
Target {
|
||||
llvm_target,
|
||||
metadata: crate::spec::TargetMetadata {
|
||||
description: Some("64-bit macOS (10.12+, Sierra+)".into()),
|
||||
description: Some("x86_64 Apple macOS (10.12+, Sierra+)".into()),
|
||||
tier: Some(1),
|
||||
host_tools: Some(true),
|
||||
std: Some(true),
|
||||
|
@ -8,7 +8,7 @@ pub(crate) fn target() -> Target {
|
||||
Target {
|
||||
llvm_target,
|
||||
metadata: crate::spec::TargetMetadata {
|
||||
description: Some("64-bit x86 iOS".into()),
|
||||
description: Some("x86_64 Apple iOS Simulator".into()),
|
||||
tier: Some(2),
|
||||
host_tools: Some(false),
|
||||
std: Some(true),
|
||||
|
@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
|
||||
Target {
|
||||
llvm_target,
|
||||
metadata: crate::spec::TargetMetadata {
|
||||
description: Some("Apple Catalyst on x86_64".into()),
|
||||
description: Some("x86_64 Apple Mac Catalyst".into()),
|
||||
tier: Some(2),
|
||||
host_tools: Some(false),
|
||||
std: Some(true),
|
||||
|
@ -8,7 +8,7 @@ pub(crate) fn target() -> Target {
|
||||
Target {
|
||||
llvm_target,
|
||||
metadata: crate::spec::TargetMetadata {
|
||||
description: Some("x86 64-bit tvOS".into()),
|
||||
description: Some("x86_64 Apple tvOS Simulator".into()),
|
||||
tier: Some(3),
|
||||
host_tools: Some(false),
|
||||
std: Some(true),
|
||||
|
@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
|
||||
Target {
|
||||
llvm_target,
|
||||
metadata: crate::spec::TargetMetadata {
|
||||
description: Some("x86 64-bit Apple WatchOS simulator".into()),
|
||||
description: Some("x86_64 Apple watchOS Simulator".into()),
|
||||
tier: Some(3),
|
||||
host_tools: Some(false),
|
||||
std: Some(true),
|
||||
|
@ -29,7 +29,7 @@ pub(crate) fn target() -> Target {
|
||||
Target {
|
||||
llvm_target,
|
||||
metadata: crate::spec::TargetMetadata {
|
||||
description: Some("macOS with late-gen Intel (at least Haswell)".into()),
|
||||
description: Some("x86_64 Apple macOS with Intel Haswell+".into()),
|
||||
tier: Some(3),
|
||||
host_tools: Some(true),
|
||||
std: Some(true),
|
||||
|
Loading…
Reference in New Issue
Block a user