From 4ef16741e355754abd446acbd80e5afb784864c7 Mon Sep 17 00:00:00 2001
From: Corey Farwell <coreyf@rwell.org>
Date: Fri, 28 Nov 2014 11:57:41 -0500
Subject: 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
---
 src/libcore/tuple/mod.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/libcore/tuple')

diff --git a/src/libcore/tuple/mod.rs b/src/libcore/tuple/mod.rs
index 56ea7a4e7a1..5ad01ae6744 100644
--- a/src/libcore/tuple/mod.rs
+++ b/src/libcore/tuple/mod.rs
@@ -69,7 +69,8 @@ pub use unit;
 use clone::Clone;
 use cmp::*;
 use default::Default;
-use option::{Option, Some};
+use option::Option;
+use option::Option::Some;
 
 // macro for implementing n-ary tuple functions and operations
 macro_rules! tuple_impls {
-- 
cgit 1.4.1-3-g733a5