From 3cc95314c31311138e189d2ad91bb537d034d3c1 Mon Sep 17 00:00:00 2001 From: Brendan Zabarauskas Date: Sun, 23 Feb 2014 12:07:11 +1100 Subject: [PATCH] Remove std::default::Default from the prelude --- src/libcollections/hashmap.rs | 1 + src/libstd/prelude.rs | 1 - src/libstd/rand/reseeding.rs | 1 + src/libstd/str.rs | 1 + src/libsyntax/opt_vec.rs | 1 + src/libuuid/lib.rs | 1 + 6 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libcollections/hashmap.rs b/src/libcollections/hashmap.rs index 4f0b7dfb35dd..7ab859796927 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 ce746852daed..63f54da76ba0 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 758ca22e5c3e..a916ce173fb6 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 daaf46be1876..12044b4a06a5 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 3abd411a0039..325df0ba7777 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 { diff --git a/src/libuuid/lib.rs b/src/libuuid/lib.rs index 7a3ed09a492d..a978a9074f04 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;