From 054b1ff989e278ad1ea278c87beda25a8587d367 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Mon, 14 Jul 2014 14:45:10 -0700 Subject: [PATCH] Remove kludgy imports from vec! macro --- src/libcollections/bitv.rs | 2 +- src/libcollections/btree.rs | 2 ++ src/libcollections/enum_set.rs | 2 ++ src/libcollections/macros.rs | 18 ------------------ src/libcollections/ringbuf.rs | 2 +- src/libcollections/smallintmap.rs | 2 +- src/libcollections/str.rs | 4 +++- src/libcollections/treemap.rs | 2 +- src/libcollections/trie.rs | 4 ++-- src/libstd/io/net/tcp.rs | 1 + src/libstd/macros.rs | 3 --- 11 files changed, 14 insertions(+), 28 deletions(-) diff --git a/src/libcollections/bitv.rs b/src/libcollections/bitv.rs index e7190a810e47..44af3d52db98 100644 --- a/src/libcollections/bitv.rs +++ b/src/libcollections/bitv.rs @@ -1574,7 +1574,7 @@ mod tests { use std::rand::Rng; use test::Bencher; - use {Set, Mutable, MutableSet}; + use {Set, Mutable, MutableSet, MutableSeq}; use bitv::{Bitv, BitvSet, from_fn, from_bytes}; use bitv; use vec::Vec; diff --git a/src/libcollections/btree.rs b/src/libcollections/btree.rs index 096b0c7f5172..947c87daa846 100644 --- a/src/libcollections/btree.rs +++ b/src/libcollections/btree.rs @@ -782,6 +782,8 @@ mod test_btree { use super::{BTree, Node, LeafElt}; + use MutableSeq; + //Tests the functionality of the insert methods (which are unfinished). #[test] fn insert_test_one() { diff --git a/src/libcollections/enum_set.rs b/src/libcollections/enum_set.rs index 1360b412c237..ca3f6a746f33 100644 --- a/src/libcollections/enum_set.rs +++ b/src/libcollections/enum_set.rs @@ -141,6 +141,8 @@ mod test { use enum_set::{EnumSet, CLike}; + use MutableSeq; + #[deriving(PartialEq, Show)] #[repr(uint)] enum Foo { diff --git a/src/libcollections/macros.rs b/src/libcollections/macros.rs index 0e4b46cfc56f..db062a70bbb6 100644 --- a/src/libcollections/macros.rs +++ b/src/libcollections/macros.rs @@ -11,26 +11,8 @@ #![macro_escape] /// Create a `std::vec::Vec` containing the arguments. -#[cfg(not(test))] macro_rules! vec( ($($e:expr),*) => ({ - #[allow(unused_imports)] - use std::collections::MutableSeq; - - // leading _ to allow empty construction without a warning. - let mut _temp = ::vec::Vec::new(); - $(_temp.push($e);)* - _temp - }); - ($($e:expr),+,) => (vec!($($e),+)) -) - -#[cfg(test)] -macro_rules! vec( - ($($e:expr),*) => ({ - #[allow(unused_imports)] - use MutableSeq; - // leading _ to allow empty construction without a warning. let mut _temp = ::vec::Vec::new(); $(_temp.push($e);)* diff --git a/src/libcollections/ringbuf.rs b/src/libcollections/ringbuf.rs index c56781ec30b7..3a4e66b38ae3 100644 --- a/src/libcollections/ringbuf.rs +++ b/src/libcollections/ringbuf.rs @@ -422,7 +422,7 @@ mod tests { use test::Bencher; use test; - use {Deque, Mutable}; + use {Deque, Mutable, MutableSeq}; use super::RingBuf; use vec::Vec; diff --git a/src/libcollections/smallintmap.rs b/src/libcollections/smallintmap.rs index ca62b1235d55..eb97215c721b 100644 --- a/src/libcollections/smallintmap.rs +++ b/src/libcollections/smallintmap.rs @@ -22,7 +22,7 @@ use core::fmt; use core::iter::{Enumerate, FilterMap}; use core::mem::replace; -use {Collection, Mutable, Map, MutableMap}; +use {Collection, Mutable, Map, MutableMap, MutableSeq}; use {vec, slice}; use vec::Vec; diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs index 653f6bae26c2..c0e903677de3 100644 --- a/src/libcollections/str.rs +++ b/src/libcollections/str.rs @@ -562,6 +562,8 @@ pub mod raw { use string::String; use vec::Vec; + use MutableSeq; + pub use core::str::raw::{from_utf8, c_str_to_static_slice, slice_bytes}; pub use core::str::raw::{slice_unchecked}; @@ -818,7 +820,7 @@ mod tests { use std::option::{Some, None}; use std::ptr::RawPtr; use std::iter::{Iterator, DoubleEndedIterator}; - use Collection; + use {Collection, MutableSeq}; use super::*; use std::slice::{Vector, ImmutableVector}; diff --git a/src/libcollections/treemap.rs b/src/libcollections/treemap.rs index 124209ba52e2..5658d07a1d17 100644 --- a/src/libcollections/treemap.rs +++ b/src/libcollections/treemap.rs @@ -1659,7 +1659,7 @@ mod test_set { use std::prelude::*; use std::hash; - use {Set, MutableSet, Mutable, MutableMap}; + use {Set, MutableSet, Mutable, MutableMap, MutableSeq}; use super::{TreeMap, TreeSet}; #[test] diff --git a/src/libcollections/trie.rs b/src/libcollections/trie.rs index 424cda92c12d..5a00c4b85daf 100644 --- a/src/libcollections/trie.rs +++ b/src/libcollections/trie.rs @@ -682,7 +682,7 @@ mod test_map { use std::uint; use std::hash; - use {MutableMap, Map}; + use {MutableMap, Map, MutableSeq}; use super::{TrieMap, TrieNode, Internal, External, Nothing}; fn check_integrity(trie: &TrieNode) { @@ -1105,7 +1105,7 @@ mod test_set { use std::prelude::*; use std::uint; - use {MutableSet, Set}; + use {MutableSet, Set, MutableSeq}; use super::TrieSet; #[test] diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs index 642654ba6ed8..cb754135bc15 100644 --- a/src/libstd/io/net/tcp.rs +++ b/src/libstd/io/net/tcp.rs @@ -18,6 +18,7 @@ //! listener (socket server) implements the `Listener` and `Acceptor` traits. use clone::Clone; +use collections::MutableSeq; use io::IoResult; use iter::Iterator; use slice::ImmutableVector; diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index 6de6b9d680f7..3c6c860f516b 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -315,9 +315,6 @@ macro_rules! try( #[macro_export] macro_rules! vec( ($($e:expr),*) => ({ - #[allow(unused_imports)] - use std::collections::MutableSeq; - // leading _ to allow empty construction without a warning. let mut _temp = ::std::vec::Vec::new(); $(_temp.push($e);)*