From cff6aba76ea01888854a87bdd4c1f71aada8d250 Mon Sep 17 00:00:00 2001
From: gifnksm <makoto.nksm@gmail.com>
Date: Thu, 2 May 2013 20:20:22 +0900
Subject: libcore: Export core::from_str::FromStr from core::prelude

---
 src/libstd/net_url.rs    | 8 +++-----
 src/libstd/num/bigint.rs | 5 ++---
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/libstd')

diff --git a/src/libstd/net_url.rs b/src/libstd/net_url.rs
index f3b11c13279..fa872ffee87 100644
--- a/src/libstd/net_url.rs
+++ b/src/libstd/net_url.rs
@@ -13,15 +13,13 @@
 #[allow(deprecated_mode)];
 
 use core::cmp::Eq;
+#[cfg(stage0)]
 use core::from_str::FromStr;
 use core::io::{Reader, ReaderUtil};
 use core::io;
 use core::hashmap::HashMap;
 use core::str;
-use core::to_bytes::IterBytes;
 use core::to_bytes;
-use core::to_str::ToStr;
-use core::to_str;
 use core::uint;
 
 #[deriving(Clone, Eq)]
@@ -703,13 +701,13 @@ pub fn to_str(url: &Url) -> ~str {
     fmt!("%s:%s%s%s%s", url.scheme, authority, url.path, query, fragment)
 }
 
-impl to_str::ToStr for Url {
+impl ToStr for Url {
     pub fn to_str(&self) -> ~str {
         to_str(self)
     }
 }
 
-impl to_bytes::IterBytes for Url {
+impl IterBytes for Url {
     fn iter_bytes(&self, lsb0: bool, f: to_bytes::Cb) {
         self.to_str().iter_bytes(lsb0, f)
     }
diff --git a/src/libstd/num/bigint.rs b/src/libstd/num/bigint.rs
index e2a336027fd..497ce7f41aa 100644
--- a/src/libstd/num/bigint.rs
+++ b/src/libstd/num/bigint.rs
@@ -21,7 +21,6 @@ A BigInt is a combination of BigUint and Sign.
 
 use core::cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
 use core::num::{IntConvertible, Zero, One, ToStrRadix, FromStrRadix};
-use core::*;
 
 /**
 A BigDigit is a BigUint's composing element.
@@ -141,7 +140,7 @@ impl ToStr for BigUint {
     fn to_str(&self) -> ~str { self.to_str_radix(10) }
 }
 
-impl from_str::FromStr for BigUint {
+impl FromStr for BigUint {
     #[inline(always)]
     fn from_str(s: &str) -> Option<BigUint> {
         FromStrRadix::from_str_radix(s, 10)
@@ -785,7 +784,7 @@ impl ToStr for BigInt {
     fn to_str(&self) -> ~str { self.to_str_radix(10) }
 }
 
-impl from_str::FromStr for BigInt {
+impl FromStr for BigInt {
     #[inline(always)]
     fn from_str(s: &str) -> Option<BigInt> {
         FromStrRadix::from_str_radix(s, 10)
-- 
cgit 1.4.1-3-g733a5


From e34a7ecbab8190560d50d4ccb21ffdae855b7c60 Mon Sep 17 00:00:00 2001
From: gifnksm <makoto.nksm@gmail.com>
Date: Fri, 3 May 2013 15:57:05 +0900
Subject: Remove extra `#[cfg(stage0)]`

---
 src/libcore/bool.rs   | 3 ---
 src/libstd/net_url.rs | 2 --
 2 files changed, 5 deletions(-)

(limited to 'src/libstd')

diff --git a/src/libcore/bool.rs b/src/libcore/bool.rs
index 1b5855049ca..1b4b81dca26 100644
--- a/src/libcore/bool.rs
+++ b/src/libcore/bool.rs
@@ -108,9 +108,6 @@ mod tests {
 
     #[test]
     fn test_bool_from_str() {
-        #[cfg(stage0)]
-        use from_str::FromStr;
-
         do all_values |v| {
             assert!(Some(v) == FromStr::from_str(to_str(v)))
         }
diff --git a/src/libstd/net_url.rs b/src/libstd/net_url.rs
index fa872ffee87..21e1733cc30 100644
--- a/src/libstd/net_url.rs
+++ b/src/libstd/net_url.rs
@@ -13,8 +13,6 @@
 #[allow(deprecated_mode)];
 
 use core::cmp::Eq;
-#[cfg(stage0)]
-use core::from_str::FromStr;
 use core::io::{Reader, ReaderUtil};
 use core::io;
 use core::hashmap::HashMap;
-- 
cgit 1.4.1-3-g733a5