about summary refs log tree commit diff
path: root/src/liballoc/boxed.rs
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2014-11-28 11:57:41 -0500
committerCorey Farwell <coreyf@rwell.org>2014-12-05 18:13:04 -0500
commit4ef16741e355754abd446acbd80e5afb784864c7 (patch)
treebfe4f64de5b3bcf88672424d0f66b5ad12fe7054 /src/liballoc/boxed.rs
parent6f4c11be3b9706d1ba0e1b74b89de1478410a56f (diff)
downloadrust-4ef16741e355754abd446acbd80e5afb784864c7.tar.gz
rust-4ef16741e355754abd446acbd80e5afb784864c7.zip
Utilize fewer reexports
In regards to:

https://github.com/rust-lang/rust/issues/19253#issuecomment-64836729

This commit:

* Changes the #deriving code so that it generates code that utilizes fewer
  reexports (in particur Option::* and Result::*), which is necessary to
  remove those reexports in the future
* Changes other areas of the codebase so that fewer reexports are utilized
Diffstat (limited to 'src/liballoc/boxed.rs')
-rw-r--r--src/liballoc/boxed.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs
index 000dda59e3d..eb483498998 100644
--- a/src/liballoc/boxed.rs
+++ b/src/liballoc/boxed.rs
@@ -19,7 +19,8 @@ use core::kinds::Sized;
 use core::mem;
 use core::option::Option;
 use core::raw::TraitObject;
-use core::result::{Ok, Err, Result};
+use core::result::Result;
+use core::result::Result::{Ok, Err};
 
 /// A value that represents the global exchange heap. This is the default
 /// place that the `box` keyword allocates into when no place is supplied.