rollup merge of rust-lang#19653: frewsxcv/rm-reexports

Brief note: This does *not* affect anything in the prelude

Part of rust-lang#19253

All this does is remove the reexporting of Result and Option from their
respective modules. More core reexports might be removed, but these ones
are the safest to remove since these enums (and their variants) are included in
the prelude.

Depends on rust-lang#19407 which is merged, but might need a new snapshot

[breaking-change]

src/libcore/option.rs

@@ -143,7 +143,7 @@
 
 #![stable]
 
-pub use self::Option::*;
+use self::Option::*;
 
 use cmp::{Eq, Ord};
 use default::Default;

src/libcore/result.rs

@@ -230,7 +230,7 @@
 
 #![stable]
 
-pub use self::Result::*;
+use self::Result::*;
 
 use kinds::Copy;
 use std::fmt::Show;

src/libstd/dynamic_lib.rs

@@ -21,9 +21,11 @@ use iter::IteratorExt;
 use mem;
 use ops::*;
 use option::*;
+use option::Option::{None, Some};
 use os;
 use path::{Path,GenericPath};
 use result::*;
+use result::Result::{Err, Ok};
 use slice::{AsSlice,SlicePrelude};
 use str;
 use string::String;
@@ -216,6 +218,7 @@ pub mod dl {
     use kinds::Copy;
     use ptr;
     use result::*;
+    use result::Result::{Err, Ok};
     use string::String;
 
     pub unsafe fn open_external<T: ToCStr>(filename: T) -> *mut u8 {

src/libstd/sync/poison.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use option::None;
+use option::Option::None;
 use rustrt::task::Task;
 use rustrt::local::Local;