Switch to purely namespaced enums

This breaks code that referred to variant names in the same namespace as
their enum. Reexport the variants in the old location or alter code to
refer to the new locations:

```
pub enum Foo {
    A,
    B
}

fn main() {
    let a = A;
}
```
=>
```
pub use self::Foo::{A, B};

pub enum Foo {
    A,
    B
}

fn main() {
    let a = A;
}
```
or
```
pub enum Foo {
    A,
    B
}

fn main() {
    let a = Foo::A;
}
```

[breaking-change]

20 files changed, 64 insertions, 12 deletions

diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs
index 779cd425d2a..0471d5e902c 100644
--- a/src/libstd/collections/hash/map.rs
+++ b/src/libstd/collections/hash/map.rs
@@ -10,6 +10,10 @@
 //
 // ignore-lexer-test FIXME #15883
 
+pub use self::Entry::*;
+use self::SearchResult::*;
+use self::VacantEntryState::*;
+
 use clone::Clone;
 use cmp::{max, Eq, Equiv, PartialEq};
 use default::Default;
diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs
index 05faba4950b..76e15f7375c 100644
--- a/src/libstd/collections/hash/table.rs
+++ b/src/libstd/collections/hash/table.rs
@@ -10,6 +10,8 @@
 //
 // ignore-lexer-test FIXME #15883
 
+pub use self::BucketState::*;
+
 use clone::Clone;
 use cmp;
 use hash::{Hash, Hasher};
diff --git a/src/libstd/dynamic_lib.rs b/src/libstd/dynamic_lib.rs
index e3dfa8cabee..8bb82d5bc1e 100644
--- a/src/libstd/dynamic_lib.rs
+++ b/src/libstd/dynamic_lib.rs
@@ -210,6 +210,7 @@ mod test {
           target_os = "freebsd",
           target_os = "dragonfly"))]
 pub mod dl {
+    pub use self::Rtld::*;
 
     use c_str::{CString, ToCStr};
     use libc;
diff --git a/src/libstd/error.rs b/src/libstd/error.rs
index b048ab13968..82ad893f88a 100644
--- a/src/libstd/error.rs
+++ b/src/libstd/error.rs
@@ -59,13 +59,13 @@
 //!
 //! impl FromError<IoError> for MyError {
 //!     fn from_error(err: IoError) -> MyError {
-//!         Io(err)
+//!         MyError::Io(err)
 //!     }
 //! }
 //!
 //! impl FromError<MapError> for MyError {
 //!     fn from_error(err: MapError) -> MyError {
-//!         Map(err)
+//!         MyError::Map(err)
 //!     }
 //! }
 //!
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index 66c29db0455..33db3c37666 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -221,6 +221,12 @@ responding to errors that may occur while attempting to read the numbers.
 #![experimental]
 #![deny(unused_must_use)]
 
+pub use self::SeekStyle::*;
+pub use self::FileMode::*;
+pub use self::FileAccess::*;
+pub use self::FileType::*;
+pub use self::IoErrorKind::*;
+
 use char::Char;
 use clone::Clone;
 use default::Default;
@@ -1899,6 +1905,7 @@ impl fmt::Show for FilePermission {
 
 #[cfg(test)]
 mod tests {
+    use self::BadReaderBehavior::*;
     use super::{IoResult, Reader, MemReader, NoProgress, InvalidInput};
     use prelude::*;
     use uint;
diff --git a/src/libstd/io/net/addrinfo.rs b/src/libstd/io/net/addrinfo.rs
index 22775d54eff..13f602de03a 100644
--- a/src/libstd/io/net/addrinfo.rs
+++ b/src/libstd/io/net/addrinfo.rs
@@ -19,6 +19,10 @@ getaddrinfo()
 
 #![allow(missing_docs)]
 
+pub use self::SocketType::*;
+pub use self::Flag::*;
+pub use self::Protocol::*;
+
 use iter::Iterator;
 use io::{IoResult};
 use io::net::ip::{SocketAddr, IpAddr};
diff --git a/src/libstd/io/net/ip.rs b/src/libstd/io/net/ip.rs
index 7ba5e173182..d87768a0860 100644
--- a/src/libstd/io/net/ip.rs
+++ b/src/libstd/io/net/ip.rs
@@ -15,6 +15,8 @@
 
 #![allow(missing_docs)]
 
+pub use self::IpAddr::*;
+
 use fmt;
 use io::{mod, IoResult, IoError};
 use io::net;
diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs
index 5b5bb618151..16e568f30f2 100644
--- a/src/libstd/io/process.rs
+++ b/src/libstd/io/process.rs
@@ -13,6 +13,9 @@
 #![allow(experimental)]
 #![allow(non_upper_case_globals)]
 
+pub use self::StdioContainer::*;
+pub use self::ProcessExit::*;
+
 use prelude::*;
 
 use fmt;
diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs
index 00d62f389ca..362e80f9f12 100644
--- a/src/libstd/io/stdio.rs
+++ b/src/libstd/io/stdio.rs
@@ -27,6 +27,8 @@ out.write(b"Hello, world!");
 
 */
 
+use self::StdSource::*;
+
 use failure::local_stderr;
 use fmt;
 use io::{Reader, Writer, IoResult, IoError, OtherIoError,
diff --git a/src/libstd/num/strconv.rs b/src/libstd/num/strconv.rs
index d1a89d72621..f8ba9b72011 100644
--- a/src/libstd/num/strconv.rs
+++ b/src/libstd/num/strconv.rs
@@ -12,6 +12,10 @@
 
 #![allow(missing_docs)]
 
+pub use self::ExponentFormat::*;
+pub use self::SignificantDigits::*;
+pub use self::SignFormat::*;
+
 use char;
 use num;
 use num::{Int, Float, FPNaN, FPInfinite, ToPrimitive};
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index d1df2ed9967..f5aa2259f8d 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -31,6 +31,10 @@
 #![allow(missing_docs)]
 #![allow(non_snake_case)]
 
+pub use self::MemoryMapKind::*;
+pub use self::MapOption::*;
+pub use self::MapError::*;
+
 use clone::Clone;
 use error::{FromError, Error};
 use fmt;
diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs
index a053f57bf12..f31ffdab17b 100644
--- a/src/libstd/path/windows.rs
+++ b/src/libstd/path/windows.rs
@@ -12,6 +12,8 @@
 
 //! Windows file path handling
 
+pub use self::PathPrefix::*;
+
 use ascii::AsciiCast;
 use c_str::{CString, ToCStr};
 use clone::Clone;
diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs
index a9e99940c46..65f45c3f97e 100644
--- a/src/libstd/prelude.rs
+++ b/src/libstd/prelude.rs
@@ -62,17 +62,20 @@
 #[doc(no_inline)] pub use char::{Char, UnicodeChar};
 #[doc(no_inline)] pub use clone::Clone;
 #[doc(no_inline)] pub use cmp::{PartialEq, PartialOrd, Eq, Ord};
-#[doc(no_inline)] pub use cmp::{Ordering, Less, Equal, Greater, Equiv};
+#[doc(no_inline)] pub use cmp::{Ordering, Equiv};
+#[doc(no_inline)] pub use cmp::Ordering::{Less, Equal, Greater};
 #[doc(no_inline)] pub use iter::{FromIterator, Extend, ExactSize};
 #[doc(no_inline)] pub use iter::{Iterator, DoubleEndedIterator};
 #[doc(no_inline)] pub use iter::{RandomAccessIterator, CloneableIterator};
 #[doc(no_inline)] pub use iter::{OrdIterator, MutableDoubleEndedIterator};
 #[doc(no_inline)] pub use num::{ToPrimitive, FromPrimitive};
 #[doc(no_inline)] pub use boxed::Box;
-#[doc(no_inline)] pub use option::{Option, Some, None};
+#[doc(no_inline)] pub use option::Option;
+#[doc(no_inline)] pub use option::Option::{Some, None};
 #[doc(no_inline)] pub use path::{GenericPath, Path, PosixPath, WindowsPath};
 #[doc(no_inline)] pub use ptr::{RawPtr, RawMutPtr};
-#[doc(no_inline)] pub use result::{Result, Ok, Err};
+#[doc(no_inline)] pub use result::Result;
+#[doc(no_inline)] pub use result::Result::{Ok, Err};
 #[doc(no_inline)] pub use io::{Buffer, Writer, Reader, Seek, BufferPrelude};
 #[doc(no_inline)] pub use str::{Str, StrVector, StrPrelude};
 #[doc(no_inline)] pub use str::{IntoMaybeOwned, StrAllocating, UnicodeStrPrelude};
diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs
index 83ea57e5538..92cfc859cd0 100644
--- a/src/libstd/rand/os.rs
+++ b/src/libstd/rand/os.rs
@@ -17,6 +17,8 @@ pub use self::imp::OsRng;
 mod imp {
     extern crate libc;
 
+    use self::OsRngInner::*;
+
     use io::{IoResult, File};
     use path::Path;
     use rand::Rng;
diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs
index 59a10f79d93..0f888bd222c 100644
--- a/src/libstd/rt/backtrace.rs
+++ b/src/libstd/rt/backtrace.rs
@@ -541,6 +541,8 @@ mod imp {
     #[allow(non_snake_case)]
     #[allow(dead_code)]
     mod uw {
+        pub use self::_Unwind_Reason_Code::*;
+
         use libc;
 
         #[repr(C)]
@@ -622,7 +624,8 @@ mod imp {
 
             let mut val: _Unwind_Word = 0;
             let ptr = &mut val as *mut _Unwind_Word;
-            let _ = _Unwind_VRS_Get(ctx, _UVRSC_CORE, 15, _UVRSD_UINT32,
+            let _ = _Unwind_VRS_Get(ctx, _Unwind_VRS_RegClass::_UVRSC_CORE, 15,
+                                    _Unwind_VRS_DataRepresentation::_UVRSD_UINT32,
                                     ptr as *mut libc::c_void);
             (val & !1) as libc::uintptr_t
         }
@@ -813,11 +816,11 @@ mod imp {
         pub fn init_frame(frame: &mut super::STACKFRAME64,
                           ctx: &CONTEXT) -> libc::DWORD {
             frame.AddrPC.Offset = ctx.Eip as u64;
-            frame.AddrPC.Mode = super::AddrModeFlat;
+            frame.AddrPC.Mode = super::ADDRESS_MODE::AddrModeFlat;
             frame.AddrStack.Offset = ctx.Esp as u64;
-            frame.AddrStack.Mode = super::AddrModeFlat;
+            frame.AddrStack.Mode = super::ADDRESS_MODE::AddrModeFlat;
             frame.AddrFrame.Offset = ctx.Ebp as u64;
-            frame.AddrFrame.Mode = super::AddrModeFlat;
+            frame.AddrFrame.Mode = super::ADDRESS_MODE::AddrModeFlat;
             super::IMAGE_FILE_MACHINE_I386
         }
     }
@@ -903,11 +906,11 @@ mod imp {
         pub fn init_frame(frame: &mut super::STACKFRAME64,
                           ctx: &CONTEXT) -> DWORD {
             frame.AddrPC.Offset = ctx.Rip as u64;
-            frame.AddrPC.Mode = super::AddrModeFlat;
+            frame.AddrPC.Mode = super::ADDRESS_MODE::AddrModeFlat;
             frame.AddrStack.Offset = ctx.Rsp as u64;
-            frame.AddrStack.Mode = super::AddrModeFlat;
+            frame.AddrStack.Mode = super::ADDRESS_MODE::AddrModeFlat;
             frame.AddrFrame.Offset = ctx.Rbp as u64;
-            frame.AddrFrame.Mode = super::AddrModeFlat;
+            frame.AddrFrame.Mode = super::ADDRESS_MODE::AddrModeFlat;
             super::IMAGE_FILE_MACHINE_AMD64
         }
     }
diff --git a/src/libstd/sync/future.rs b/src/libstd/sync/future.rs
index be0af3a3f1a..e37d1f83877 100644
--- a/src/libstd/sync/future.rs
+++ b/src/libstd/sync/future.rs
@@ -29,6 +29,7 @@
 use core::prelude::*;
 use core::mem::replace;
 
+use self::FutureState::*;
 use comm::{Receiver, channel};
 use task::spawn;
 
diff --git a/src/libstd/sys/common/net.rs b/src/libstd/sys/common/net.rs
index fc3a8230c4c..9b2b594a9c7 100644
--- a/src/libstd/sys/common/net.rs
+++ b/src/libstd/sys/common/net.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+pub use self::SocketStatus::*;
+pub use self::InAddr::*;
+
 use alloc::arc::Arc;
 use libc::{mod, c_char, c_int};
 use mem;
diff --git a/src/libstd/sys/unix/process.rs b/src/libstd/sys/unix/process.rs
index d7de841f958..81bc138ca91 100644
--- a/src/libstd/sys/unix/process.rs
+++ b/src/libstd/sys/unix/process.rs
@@ -7,6 +7,7 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
+use self::Req::*;
 
 use libc::{mod, pid_t, c_void, c_int};
 use c_str::CString;
diff --git a/src/libstd/sys/unix/timer.rs b/src/libstd/sys/unix/timer.rs
index 184ef3adce1..6ebbedb8e90 100644
--- a/src/libstd/sys/unix/timer.rs
+++ b/src/libstd/sys/unix/timer.rs
@@ -46,6 +46,8 @@
 //!
 //! Note that all time units in this file are in *milliseconds*.
 
+pub use self::Req::*;
+
 use libc;
 use mem;
 use os;
diff --git a/src/libstd/sys/windows/timer.rs b/src/libstd/sys/windows/timer.rs
index f507be2a985..9af3a7c8b6e 100644
--- a/src/libstd/sys/windows/timer.rs
+++ b/src/libstd/sys/windows/timer.rs
@@ -20,6 +20,8 @@
 //! Other than that, the implementation is pretty straightforward in terms of
 //! the other two implementations of timers with nothing *that* new showing up.
 
+pub use self::Req::*;
+
 use libc;
 use ptr;
 use comm;