Auto merge of #39218 - xen0n:syntax-warts, r=alexcrichton

syntax: remove abi::Os and abi::Architecture

They're long dead since the switch to flexible targets, but was not removed like their consumers were. Interesting they even got maintained by various porters out there!

Technically [syntax-breaking] as they're public API, but since they're unused in the compiler, the potential breakage IMO should be minimal.

1 files changed, 0 insertions, 48 deletions

diff --git a/src/libsyntax/abi.rs b/src/libsyntax/abi.rs
index 3b0db7b50a6..42f3aa5ffd6 100644
--- a/src/libsyntax/abi.rs
+++ b/src/libsyntax/abi.rs
@@ -10,24 +10,6 @@
 
 use std::fmt;
 
-#[derive(Copy, Clone, PartialEq, Eq, Debug)]
-#[allow(non_camel_case_types)]
-pub enum Os {
-    Windows,
-    Macos,
-    Linux,
-    Android,
-    Freebsd,
-    iOS,
-    Dragonfly,
-    Bitrig,
-    Netbsd,
-    Openbsd,
-    NaCl,
-    Haiku,
-    Solaris,
-}
-
 #[derive(PartialEq, Eq, Hash, RustcEncodable, RustcDecodable, Clone, Copy, Debug)]
 pub enum Abi {
     // NB: This ordering MUST match the AbiDatas array below.
@@ -54,16 +36,6 @@ pub enum Abi {
     Unadjusted
 }
 
-#[allow(non_camel_case_types)]
-#[derive(Copy, Clone, PartialEq, Debug)]
-pub enum Architecture {
-    X86,
-    X86_64,
-    Arm,
-    Mips,
-    Mipsel
-}
-
 #[derive(Copy, Clone)]
 pub struct AbiData {
     abi: Abi,
@@ -133,26 +105,6 @@ impl fmt::Display for Abi {
     }
 }
 
-impl fmt::Display for Os {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match *self {
-            Os::Linux => "linux".fmt(f),
-            Os::Windows => "windows".fmt(f),
-            Os::Macos => "macos".fmt(f),
-            Os::iOS => "ios".fmt(f),
-            Os::Android => "android".fmt(f),
-            Os::Freebsd => "freebsd".fmt(f),
-            Os::Dragonfly => "dragonfly".fmt(f),
-            Os::Bitrig => "bitrig".fmt(f),
-            Os::Netbsd => "netbsd".fmt(f),
-            Os::Openbsd => "openbsd".fmt(f),
-            Os::NaCl => "nacl".fmt(f),
-            Os::Haiku => "haiku".fmt(f),
-            Os::Solaris => "solaris".fmt(f),
-        }
-    }
-}
-
 #[allow(non_snake_case)]
 #[test]
 fn lookup_Rust() {