Skip to content

Commit d5eb31c

Browse files
borsbors
committed
Auto merge of rust-lang#136953 - ken-matsui:import-target-metadata, r=workingjubilee
rustc_target: import TargetMetadata
2 parents d1fb81e + b660382 commit d5eb31c

File tree

274 files changed

+679
-568
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

274 files changed

+679
-568
lines changed

‎compiler/rustc_target/src/spec/targets/aarch64_apple_darwin.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{FramePointer, SanitizerSet, Target, TargetOptions};
2+
use crate::spec::{FramePointer, SanitizerSet, Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("macos", Arch::Arm64, TargetAbi::Normal);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple macOS (11.0+, Big Sur+)".into()),
1010
tier: Some(1),
1111
host_tools: Some(true),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_ios.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{FramePointer, SanitizerSet, Target, TargetOptions};
2+
use crate::spec::{FramePointer, SanitizerSet, Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("ios", Arch::Arm64, TargetAbi::Normal);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple iOS".into()),
1010
tier: Some(2),
1111
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_ios_macabi.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{FramePointer, SanitizerSet, Target, TargetOptions};
2+
use crate::spec::{FramePointer, SanitizerSet, Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("ios", Arch::Arm64, TargetAbi::MacCatalyst);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple Mac Catalyst".into()),
1010
tier: Some(2),
1111
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_ios_sim.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{FramePointer, SanitizerSet, Target, TargetOptions};
2+
use crate::spec::{FramePointer, SanitizerSet, Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("ios", Arch::Arm64, TargetAbi::Simulator);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple iOS Simulator".into()),
1010
tier: Some(2),
1111
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_tvos.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{FramePointer, Target, TargetOptions};
2+
use crate::spec::{FramePointer, Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("tvos", Arch::Arm64, TargetAbi::Normal);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple tvOS".into()),
1010
tier: Some(3),
1111
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_tvos_sim.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{FramePointer, Target, TargetOptions};
2+
use crate::spec::{FramePointer, Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("tvos", Arch::Arm64, TargetAbi::Simulator);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple tvOS Simulator".into()),
1010
tier: Some(3),
1111
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_visionos.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{FramePointer, SanitizerSet, Target, TargetOptions};
2+
use crate::spec::{FramePointer, SanitizerSet, Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("visionos", Arch::Arm64, TargetAbi::Normal);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple visionOS".into()),
1010
tier: Some(3),
1111
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_visionos_sim.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{FramePointer, SanitizerSet, Target, TargetOptions};
2+
use crate::spec::{FramePointer, SanitizerSet, Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("visionos", Arch::Arm64, TargetAbi::Simulator);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple visionOS simulator".into()),
1010
tier: Some(3),
1111
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_watchos.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{Target, TargetOptions};
2+
use crate::spec::{Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("watchos", Arch::Arm64, TargetAbi::Normal);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple watchOS".into()),
1010
tier: Some(3),
1111
host_tools: Some(false),

‎compiler/rustc_target/src/spec/targets/aarch64_apple_watchos_sim.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::spec::base::apple::{Arch, TargetAbi, base};
2-
use crate::spec::{FramePointer, Target, TargetOptions};
2+
use crate::spec::{FramePointer, Target, TargetMetadata, TargetOptions};
33

44
pub(crate) fn target() -> Target {
55
let (opts, llvm_target, arch) = base("watchos", Arch::Arm64, TargetAbi::Simulator);
66
Target {
77
llvm_target,
8-
metadata: crate::spec::TargetMetadata {
8+
metadata: TargetMetadata {
99
description: Some("ARM64 Apple watchOS Simulator".into()),
1010
tier: Some(3),
1111
host_tools: Some(false),

0 commit comments

Comments
 (0)