rustc_target::spec::base::apple: nix use Arch::*

This will reduce ambiguity with `rustc_target::spec::Arch`.

Author: tamird

compiler/rustc_target/src/spec/base/apple/mod.rs

@@ -11,7 +11,6 @@ use crate::spec::{
 #[cfg(test)]
 mod tests;
 
-use Arch::*;
 #[allow(non_camel_case_types)]
 #[derive(Copy, Clone, PartialEq)]
 pub(crate) enum Arch {
@@ -29,54 +28,60 @@ pub(crate) enum Arch {
 impl Arch {
  fn target_name(self) -> &'static str {
  match self {
- Armv7k => "armv7k",
- Armv7s => "armv7s",
- Arm64 => "arm64",
- Arm64e => "arm64e",
- Arm64_32 => "arm64_32",
- I386 => "i386",
- I686 => "i686",
- X86_64 => "x86_64",
- X86_64h => "x86_64h",
+ Self::Armv7k => "armv7k",
+ Self::Armv7s => "armv7s",
+ Self::Arm64 => "arm64",
+ Self::Arm64e => "arm64e",
+ Self::Arm64_32 => "arm64_32",
+ Self::I386 => "i386",
+ Self::I686 => "i686",
+ Self::X86_64 => "x86_64",
+ Self::X86_64h => "x86_64h",
  }
  }
 
  pub(crate) fn target_arch(self) -> Cow<'static, str> {
  Cow::Borrowed(match self {
- Armv7k | Armv7s => "arm",
- Arm64 | Arm64e | Arm64_32 => "aarch64",
- I386 | I686 => "x86",
- X86_64 | X86_64h => "x86_64",
+ Self::Armv7k | Self::Armv7s => "arm",
+ Self::Arm64 | Self::Arm64e | Self::Arm64_32 => "aarch64",
+ Self::I386 | Self::I686 => "x86",
+ Self::X86_64 | Self::X86_64h => "x86_64",
  })
  }
 
  fn target_cpu(self, env: TargetEnv) -> &'static str {
  match self {
- Armv7k => "cortex-a8",
- Armv7s => "swift", // iOS 10 is only supported on iPhone 5 or higher.
- Arm64 => match env {
+ Self::Armv7k => "cortex-a8",
+ Self::Armv7s => "swift", // iOS 10 is only supported on iPhone 5 or higher.
+ Self::Arm64 => match env {
  TargetEnv::Normal => "apple-a7",
  TargetEnv::Simulator => "apple-a12",
  TargetEnv::MacCatalyst => "apple-a12",
  },
- Arm64e => "apple-a12",
- Arm64_32 => "apple-s4",
+ Self::Arm64e => "apple-a12",
+ Self::Arm64_32 => "apple-s4",
  // Only macOS 10.12+ is supported, which means
  // all x86_64/x86 CPUs must be running at least penryn
  // https://github.com/llvm/llvm-project/blob/01f924d0e37a5deae51df0d77e10a15b63aa0c0f/clang/lib/Driver/ToolChains/Arch/X86.cpp#L79-L82
- I386 | I686 => "penryn",
- X86_64 => "penryn",
+ Self::I386 | Self::I686 => "penryn",
+ Self::X86_64 => "penryn",
  // Note: `core-avx2` is slightly more advanced than `x86_64h`, see
  // comments (and disabled features) in `x86_64h_apple_darwin` for
  // details. It is a higher baseline then `penryn` however.
- X86_64h => "core-avx2",
+ Self::X86_64h => "core-avx2",
  }
  }
 
  fn stack_probes(self) -> StackProbeType {
  match self {
- Armv7k | Armv7s => StackProbeType::None,
- Arm64 | Arm64e | Arm64_32 | I386 | I686 | X86_64 | X86_64h => StackProbeType::Inline,
+ Self::Armv7k | Self::Armv7s => StackProbeType::None,
+ Self::Arm64
+ | Self::Arm64e
+ | Self::Arm64_32
+ | Self::I386
+ | Self::I686
+ | Self::X86_64
+ | Self::X86_64h => StackProbeType::Inline,
  }
  }
 }
@@ -132,10 +137,10 @@ pub(crate) fn base(
  default_dwarf_version: 4,
  frame_pointer: match arch {
  // clang ignores `-fomit-frame-pointer` for Armv7, it only accepts `-momit-leaf-frame-pointer`
- Armv7k | Armv7s => FramePointer::Always,
+ Arch::Armv7k | Arch::Armv7s => FramePointer::Always,
  // clang supports omitting frame pointers for the rest, but... don't?
- Arm64 | Arm64e | Arm64_32 => FramePointer::NonLeaf,
- I386 | I686 | X86_64 | X86_64h => FramePointer::Always,
+ Arch::Arm64 | Arch::Arm64e | Arch::Arm64_32 => FramePointer::NonLeaf,
+ Arch::I386 | Arch::I686 | Arch::X86_64 | Arch::X86_64h => FramePointer::Always,
  },
  has_rpath: true,
  dll_suffix: ".dylib".into(),