From 9af324a673443367c5b58a182804982c11f73981 Mon Sep 17 00:00:00 2001
From: Corey Farwell <coreyf@rwell.org>
Date: Mon, 8 Dec 2014 12:58:01 -0500
Subject: [PATCH] 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]
---
 src/libcore/option.rs     | 2 +-
 src/libcore/result.rs     | 2 +-
 src/libstd/dynamic_lib.rs | 3 +++
 src/libstd/sync/poison.rs | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/libcore/option.rs b/src/libcore/option.rs
index 8ba41c3575fff..6c3932a0c2ee0 100644
--- 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 0cf8e6affd71e..0686f7bdee2dc 100644
--- 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 aa0c8b53c2e89..c3398746fd7e3 100644
--- a/src/libstd/dynamic_lib.rs
+++ b/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;
@@ -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 eb46fd771477e..ee1515566204b 100644
--- 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;