diff --git a/src/libcore/option.rs b/src/libcore/option.rs index 8ba41c3575f..6c3932a0c2e 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 0cf8e6affd7..0686f7bdee2 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 aa0c8b53c2e..c3398746fd7 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(filename: T) -> *mut u8 { diff --git a/src/libstd/sync/poison.rs b/src/libstd/sync/poison.rs index eb46fd77147..ee151556620 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;