about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Zabarauskas <bjzaba@yahoo.com.au>2014-02-23 12:07:11 +1100
committerAlex Crichton <alex@alexcrichton.com>2014-02-24 21:22:26 -0800
commit3cc95314c31311138e189d2ad91bb537d034d3c1 (patch)
tree7f09e97e9a20d96ded96d1f867f359fe2a6761f0
parentac64db94bf1d009a43e7f3729434417bd2e59662 (diff)
downloadrust-3cc95314c31311138e189d2ad91bb537d034d3c1.tar.gz
rust-3cc95314c31311138e189d2ad91bb537d034d3c1.zip
Remove std::default::Default from the prelude
-rw-r--r--src/libcollections/hashmap.rs1
-rw-r--r--src/libstd/prelude.rs1
-rw-r--r--src/libstd/rand/reseeding.rs1
-rw-r--r--src/libstd/str.rs1
-rw-r--r--src/libsyntax/opt_vec.rs1
-rw-r--r--src/libuuid/lib.rs1
6 files changed, 5 insertions, 1 deletions
diff --git a/src/libcollections/hashmap.rs b/src/libcollections/hashmap.rs
index 4f0b7dfb35d..7ab85979692 100644
--- a/src/libcollections/hashmap.rs
+++ b/src/libcollections/hashmap.rs
@@ -53,6 +53,7 @@
 //! ```
 
 use std::cmp::max;
+use std::default::Default;
 use std::fmt;
 use std::hash::{Hash, Hasher, sip};
 use std::iter::{FilterMap, Chain, Repeat, Zip};
diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs
index ce746852dae..63f54da76ba 100644
--- a/src/libstd/prelude.rs
+++ b/src/libstd/prelude.rs
@@ -43,7 +43,6 @@ pub use char::Char;
 pub use clone::{Clone, DeepClone};
 pub use cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater, Equiv};
 pub use container::{Container, Mutable, Map, MutableMap, Set, MutableSet};
-pub use default::Default;
 pub use from_str::FromStr;
 pub use iter::{FromIterator, Extendable};
 pub use iter::{Iterator, DoubleEndedIterator, RandomAccessIterator, CloneableIterator};
diff --git a/src/libstd/rand/reseeding.rs b/src/libstd/rand/reseeding.rs
index 758ca22e5c3..a916ce173fb 100644
--- a/src/libstd/rand/reseeding.rs
+++ b/src/libstd/rand/reseeding.rs
@@ -144,6 +144,7 @@ impl Default for ReseedWithDefault {
 mod test {
     use prelude::*;
     use super::*;
+    use default::Default;
     use rand::{SeedableRng, Rng};
 
     struct Counter {
diff --git a/src/libstd/str.rs b/src/libstd/str.rs
index daaf46be187..12044b4a06a 100644
--- a/src/libstd/str.rs
+++ b/src/libstd/str.rs
@@ -3072,6 +3072,7 @@ impl Default for ~str {
 #[cfg(test)]
 mod tests {
     use iter::AdditiveIterator;
+    use default::Default;
     use prelude::*;
     use str::*;
 
diff --git a/src/libsyntax/opt_vec.rs b/src/libsyntax/opt_vec.rs
index 3abd411a003..325df0ba777 100644
--- a/src/libsyntax/opt_vec.rs
+++ b/src/libsyntax/opt_vec.rs
@@ -16,6 +16,7 @@
  */
 
 use std::vec;
+use std::default::Default;
 
 #[deriving(Clone, Encodable, Decodable, Hash)]
 pub enum OptVec<T> {
diff --git a/src/libuuid/lib.rs b/src/libuuid/lib.rs
index 7a3ed09a492..a978a9074f0 100644
--- a/src/libuuid/lib.rs
+++ b/src/libuuid/lib.rs
@@ -66,6 +66,7 @@ extern crate serialize;
 
 use std::cast::{transmute,transmute_copy};
 use std::char::Char;
+use std::default::Default;
 use std::fmt;
 use std::hash::{Hash, sip};
 use std::num::FromStrRadix;