Remove Result and Option reexports

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

Part of #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.

[breaking-change]

diff --git a/src/libcore/option.rs b/src/libcore/option.rs
index 8ba41c3575fff5cb2afa11b87b71d63899cc128c..6c3932a0c2ee006c64b20b2f78297a3961e90580 100644 (file)
--- a/src/libcore/option.rs
+++ b/src/libcore/option.rs
@@ -143,7 +143,7 @@
 
 #![stable]
 
-pub use self::Option::*;
+use self::Option::*;
 
 use cmp::{Eq, Ord};
 use default::Default;

diff --git a/src/libcore/result.rs b/src/libcore/result.rs
index 0cf8e6affd71e0a18121e5f03b4013299a51f153..0686f7bdee2dcb154253bf6ee2803ff1c7cbb8f2 100644 (file)
--- a/src/libcore/result.rs
+++ b/src/libcore/result.rs
@@ -230,7 +230,7 @@
 
 #![stable]
 
-pub use self::Result::*;
+use self::Result::*;
 
 use std::fmt::Show;
 use slice;

diff --git a/src/libstd/dynamic_lib.rs b/src/libstd/dynamic_lib.rs
index aa0c8b53c2e897f4d123337156df11d828404a87..c3398746fd7e3a55103ef7510eb9f7462f375b50 100644 (file)
--- a/src/libstd/dynamic_lib.rs
+++ b/src/libstd/dynamic_lib.rs
@@ -21,9 +21,11 @@
 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;
@@ -212,6 +214,7 @@ pub mod dl {
     use libc;
     use ptr;
     use result::*;
+    use result::Result::{Err, Ok};
     use string::String;
 
     pub unsafe fn open_external<T: ToCStr>(filename: T) -> *mut u8 {

diff --git a/src/libstd/sync/poison.rs b/src/libstd/sync/poison.rs
index eb46fd771477e6df7349f00258478993e077dee4..ee1515566204b0c545e935c8588e183aef563cbe 100644 (file)
--- a/src/libstd/sync/poison.rs
+++ b/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;