diff options
| author | bors <bors@rust-lang.org> | 2015-10-29 03:20:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-10-29 03:20:13 +0000 |
| commit | e8e6892e3cda5e3dc8408755d7a532ff74df869d (patch) | |
| tree | 8eb1a4451545a0d40e4affe0eda8f4c75e319da2 /src/libsyntax | |
| parent | b4af35f7b1dc30468a043dabd689365f4e518bda (diff) | |
| parent | a7d93c939a9cedbc239b3ce647fb8a22125a4d22 (diff) | |
| download | rust-e8e6892e3cda5e3dc8408755d7a532ff74df869d.tar.gz rust-e8e6892e3cda5e3dc8408755d7a532ff74df869d.zip | |
Auto merge of #29289 - DiamondLovesYou:pnacl-std-crates, r=alexcrichton
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/abi.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libsyntax/abi.rs b/src/libsyntax/abi.rs index c0fe541ead5..ca44dec627e 100644 --- a/src/libsyntax/abi.rs +++ b/src/libsyntax/abi.rs @@ -27,6 +27,7 @@ pub enum Os { OsBitrig, OsNetbsd, OsOpenbsd, + OsNaCl, } #[derive(PartialEq, Eq, Hash, RustcEncodable, RustcDecodable, Clone, Copy, Debug)] @@ -143,6 +144,7 @@ impl fmt::Display for Os { OsBitrig => "bitrig".fmt(f), OsNetbsd => "netbsd".fmt(f), OsOpenbsd => "openbsd".fmt(f), + OsNaCl => "nacl".fmt(f), } } } |