Skip to content

Commit

Permalink
syntax: remove abi::Os and abi::Architecture
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
xen0n committed Jan 21, 2017
1 parent 633f38a commit 578001a
Showing 1 changed file with 0 additions and 48 deletions.
48 changes: 0 additions & 48 deletions src/libsyntax/abi.rs
Expand Up @@ -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.
Expand All @@ -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,
Expand Down Expand Up @@ -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() {
Expand Down

0 comments on commit 578001a

Please sign in to comment.