diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-03-19 23:23:00 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-03-20 09:30:14 -0700 |
| commit | da3625161d8f8bcb2f43d703eec8d002d0bb9c87 (patch) | |
| tree | 4d1a336aa48054131a90cda34ecd71ff309a3616 /src | |
| parent | 7a5a8c3c0776636aef8e1d98dfed5e96573ea544 (diff) | |
| download | rust-da3625161d8f8bcb2f43d703eec8d002d0bb9c87.tar.gz rust-da3625161d8f8bcb2f43d703eec8d002d0bb9c87.zip | |
Removing imports of std::vec_ng::Vec
It's now in the prelude.
Diffstat (limited to 'src')
182 files changed, 10 insertions, 230 deletions
diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs index a1fcddcf6b3..ae7f3246272 100644 --- a/src/compiletest/compiletest.rs +++ b/src/compiletest/compiletest.rs @@ -13,7 +13,6 @@ #[allow(non_camel_case_types)]; #[deny(warnings)]; -#[allow(deprecated_owned_vector)]; extern crate test; extern crate getopts; diff --git a/src/libarena/lib.rs b/src/libarena/lib.rs index 8d6e0386526..2cc41dd7085 100644 --- a/src/libarena/lib.rs +++ b/src/libarena/lib.rs @@ -24,7 +24,6 @@ html_root_url = "http://static.rust-lang.org/doc/master")]; #[allow(missing_doc)]; #[feature(managed_boxes)]; -#[allow(deprecated_owned_vector)]; extern crate collections; diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs index 24478ff8c5f..f92aee98479 100644 --- a/src/libcollections/lib.rs +++ b/src/libcollections/lib.rs @@ -25,7 +25,6 @@ // NOTE remove the following two attributes after the next snapshot. #[allow(unrecognized_lint)]; #[allow(default_type_param_usage)]; -#[allow(deprecated_owned_vector)]; extern crate rand; diff --git a/src/libflate/lib.rs b/src/libflate/lib.rs index d9f7ae9a856..5601bd87bb9 100644 --- a/src/libflate/lib.rs +++ b/src/libflate/lib.rs @@ -94,7 +94,6 @@ pub fn inflate_bytes_zlib(bytes: &[u8]) -> CVec<u8> { #[cfg(test)] mod tests { - #[allow(deprecated_owned_vector)]; extern crate rand; use super::{inflate_bytes, deflate_bytes}; diff --git a/src/libgetopts/lib.rs b/src/libgetopts/lib.rs index c25e38fe055..f4937755484 100644 --- a/src/libgetopts/lib.rs +++ b/src/libgetopts/lib.rs @@ -84,7 +84,6 @@ html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://static.rust-lang.org/doc/master")]; #[deny(missing_doc)]; -#[allow(deprecated_owned_vector)]; #[feature(globs, phase)]; diff --git a/src/libglob/lib.rs b/src/libglob/lib.rs index d48a7af01e8..c5af3309e21 100644 --- a/src/libglob/lib.rs +++ b/src/libglob/lib.rs @@ -30,7 +30,6 @@ #[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://static.rust-lang.org/doc/master")]; -#[allow(deprecated_owned_vector)]; use std::cell::Cell; use std::{cmp, os, path}; diff --git a/src/libgreen/lib.rs b/src/libgreen/lib.rs index 1895717374b..a23d2d4f3a5 100644 --- a/src/libgreen/lib.rs +++ b/src/libgreen/lib.rs @@ -174,7 +174,6 @@ // NB this does *not* include globs, please keep it that way. #[feature(macro_rules, phase)]; #[allow(visible_private_types)]; -#[allow(deprecated_owned_vector)]; #[cfg(test)] #[phase(syntax, link)] extern crate log; extern crate rand; diff --git a/src/liblog/directive.rs b/src/liblog/directive.rs index 9d5e1a8f9ed..50639a59eb9 100644 --- a/src/liblog/directive.rs +++ b/src/liblog/directive.rs @@ -9,7 +9,6 @@ // except according to those terms. use std::cmp; -use std::vec::Vec; #[deriving(Show, Clone)] pub struct LogDirective { diff --git a/src/liblog/lib.rs b/src/liblog/lib.rs index fa8daf79812..45ba598a795 100644 --- a/src/liblog/lib.rs +++ b/src/liblog/lib.rs @@ -126,7 +126,6 @@ use std::local_data; use std::os; use std::rt; use std::slice; -use std::vec::Vec; use sync::one::{Once, ONCE_INIT}; diff --git a/src/libnative/io/file_unix.rs b/src/libnative/io/file_unix.rs index a55dedd594d..b997aa4f11c 100644 --- a/src/libnative/io/file_unix.rs +++ b/src/libnative/io/file_unix.rs @@ -19,7 +19,6 @@ use std::libc; use std::mem; use std::rt::rtio; use std::slice; -use std::vec::Vec; use io::{IoResult, retry, keep_going}; diff --git a/src/libnative/lib.rs b/src/libnative/lib.rs index b7a38dec1ac..4b6942a1083 100644 --- a/src/libnative/lib.rs +++ b/src/libnative/lib.rs @@ -50,7 +50,6 @@ html_root_url = "http://static.rust-lang.org/doc/master")]; #[deny(unused_result, unused_must_use)]; #[allow(non_camel_case_types)]; -#[allow(deprecated_owned_vector)]; // NB this crate explicitly does *not* allow glob imports, please seriously // consider whether they're needed before adding that feature here (the diff --git a/src/libnum/bigint.rs b/src/libnum/bigint.rs index cba24b478fc..5716a1dedf3 100644 --- a/src/libnum/bigint.rs +++ b/src/libnum/bigint.rs @@ -29,7 +29,6 @@ use std::str; use std::uint; use std::{i64, u64}; use std::vec; -use std::vec::Vec; /** A `BigDigit` is a `BigUint`'s composing element. @@ -1461,7 +1460,6 @@ mod biguint_tests { use std::num::CheckedDiv; use rand::{task_rng}; use std::u64; - use std::vec::Vec; #[test] fn test_from_slice() { @@ -2195,7 +2193,6 @@ mod bigint_tests { use std::num::{ToPrimitive, FromPrimitive}; use rand::{task_rng}; use std::u64; - use std::vec::Vec; #[test] fn test_from_biguint() { diff --git a/src/libnum/lib.rs b/src/libnum/lib.rs index 05b94af9b8c..e2c6c37dae1 100644 --- a/src/libnum/lib.rs +++ b/src/libnum/lib.rs @@ -17,7 +17,6 @@ #[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://static.rust-lang.org/doc/master")]; -#[allow(deprecated_owned_vector)]; extern crate rand; diff --git a/src/libnum/rational.rs b/src/libnum/rational.rs index 1e97d85aa17..afd4fa73ef6 100644 --- a/src/libnum/rational.rs +++ b/src/libnum/rational.rs @@ -16,7 +16,6 @@ use std::cmp; use std::fmt; use std::from_str::FromStr; use std::num::{Zero,One,ToStrRadix,FromStrRadix,Round}; -use std::vec::Vec; use bigint::{BigInt, BigUint, Sign, Plus, Minus}; /// Represents the ratio between 2 numbers. diff --git a/src/librand/lib.rs b/src/librand/lib.rs index 0086b385b79..357363597d9 100644 --- a/src/librand/lib.rs +++ b/src/librand/lib.rs @@ -71,7 +71,6 @@ println!("{:?}", tuple_ptr) html_root_url = "http://static.rust-lang.org/doc/master")]; #[feature(macro_rules, managed_boxes, phase)]; -#[allow(deprecated_owned_vector)]; #[cfg(test)] #[phase(syntax, link)] extern crate log; diff --git a/src/librustc/back/archive.rs b/src/librustc/back/archive.rs index e684c8b6528..aa561333756 100644 --- a/src/librustc/back/archive.rs +++ b/src/librustc/back/archive.rs @@ -16,7 +16,6 @@ use metadata::filesearch; use lib::llvm::{ArchiveRef, llvm}; use std::cast; -use std::vec::Vec; use std::io; use std::io::{fs, TempDir}; use std::libc; diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index 25802ac9d51..b363b06fbdc 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -33,7 +33,6 @@ use std::ptr; use std::str; use std::io; use std::io::{fs, TempDir, Process}; -use std::vec::Vec; use flate; use serialize::hex::ToHex; use syntax::abi; @@ -105,7 +104,6 @@ pub mod write { use std::io::Process; use std::libc::{c_uint, c_int}; use std::str; - use std::vec::Vec; // On android, we by default compile for armv7 processors. This enables // things like double word CAS instructions (rather than emulating them) diff --git a/src/librustc/back/mips.rs b/src/librustc/back/mips.rs index c870e69b324..9667d7b84e9 100644 --- a/src/librustc/back/mips.rs +++ b/src/librustc/back/mips.rs @@ -11,7 +11,6 @@ use back::target_strs; use driver::session::sess_os_to_meta_os; use metadata::loader::meta_section_name; -use std::vec::Vec; use syntax::abi; pub fn get_target_strs(target_triple: ~str, target_os: abi::Os) -> target_strs::t { diff --git a/src/librustc/back/rpath.rs b/src/librustc/back/rpath.rs index ede7b7f3d42..08e96ec9215 100644 --- a/src/librustc/back/rpath.rs +++ b/src/librustc/back/rpath.rs @@ -15,7 +15,6 @@ use metadata::filesearch; use collections::HashSet; use std::{os, slice}; -use std::vec::Vec; use syntax::abi; fn not_win32(os: abi::Os) -> bool { diff --git a/src/librustc/back/target_strs.rs b/src/librustc/back/target_strs.rs index b07c0b2136f..1528fff5113 100644 --- a/src/librustc/back/target_strs.rs +++ b/src/librustc/back/target_strs.rs @@ -10,8 +10,6 @@ #[allow(non_camel_case_types)]; -use std::vec::Vec; - pub struct t { module_asm: ~str, meta_sect_name: ~str, diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs index 0156ca12084..ae9cd37fe69 100644 --- a/src/librustc/driver/driver.rs +++ b/src/librustc/driver/driver.rs @@ -37,7 +37,6 @@ use std::io::fs; use std::io::MemReader; use std::mem::drop; use std::os; -use std::vec::Vec; use std::vec; use getopts::{optopt, optmulti, optflag, optflagopt}; use getopts; diff --git a/src/librustc/driver/session.rs b/src/librustc/driver/session.rs index b7b7019a28b..113906f570b 100644 --- a/src/librustc/driver/session.rs +++ b/src/librustc/driver/session.rs @@ -28,7 +28,6 @@ use syntax::{abi, ast, codemap}; use syntax; use std::cell::{Cell, RefCell}; -use std::vec::Vec; use collections::HashSet; pub struct Config { @@ -407,7 +406,7 @@ macro_rules! cgoptions( } } - fn parse_list(slot: &mut ::std::vec::Vec<~str>, v: Option<&str>) + fn parse_list(slot: &mut Vec<~str>, v: Option<&str>) -> bool { match v { Some(s) => { diff --git a/src/librustc/front/config.rs b/src/librustc/front/config.rs index 349451b4205..b4861d196e0 100644 --- a/src/librustc/front/config.rs +++ b/src/librustc/front/config.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::vec::Vec; use syntax::fold::Folder; use syntax::{ast, fold, attr}; use syntax::codemap; diff --git a/src/librustc/front/feature_gate.rs b/src/librustc/front/feature_gate.rs index bb6d3fe3b10..c3743db8adc 100644 --- a/src/librustc/front/feature_gate.rs +++ b/src/librustc/front/feature_gate.rs @@ -31,7 +31,6 @@ use syntax::parse::token; use driver::session::Session; use std::cell::Cell; -use std::vec::Vec; /// This is a list of all known features since the beginning of time. This list /// can never shrink, it may only be expanded (in order to prevent old programs diff --git a/src/librustc/front/std_inject.rs b/src/librustc/front/std_inject.rs index 8b403628f77..6a6819ae516 100644 --- a/src/librustc/front/std_inject.rs +++ b/src/librustc/front/std_inject.rs @@ -11,7 +11,6 @@ use driver::session::Session; -use std::vec::Vec; use std::vec; use syntax::ast; use syntax::attr; diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index ba2760afe5d..b0def333cb3 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -28,7 +28,6 @@ This API is completely unstable and subject to change. html_root_url = "http://static.rust-lang.org/doc/master")]; #[allow(deprecated)]; -#[allow(deprecated_owned_vector)]; #[feature(macro_rules, globs, struct_variant, managed_boxes)]; #[feature(quote, default_type_params, phase)]; @@ -55,7 +54,6 @@ use std::io; use std::os; use std::str; use std::task; -use std::vec::Vec; use std::vec; use syntax::ast; use syntax::diagnostic::Emitter; diff --git a/src/librustc/metadata/creader.rs b/src/librustc/metadata/creader.rs index 4133a742c60..8d48403b6e5 100644 --- a/src/librustc/metadata/creader.rs +++ b/src/librustc/metadata/creader.rs @@ -23,7 +23,6 @@ use metadata::loader; use metadata::loader::Os; use std::cell::RefCell; -use std::vec::Vec; use collections::HashMap; use syntax::ast; use syntax::abi; diff --git a/src/librustc/metadata/csearch.rs b/src/librustc/metadata/csearch.rs index 5ee01322913..47202feef9a 100644 --- a/src/librustc/metadata/csearch.rs +++ b/src/librustc/metadata/csearch.rs @@ -20,7 +20,6 @@ use middle::typeck; use reader = serialize::ebml::reader; use std::rc::Rc; -use std::vec::Vec; use std::vec; use syntax::ast; use syntax::ast_map; diff --git a/src/librustc/metadata/cstore.rs b/src/librustc/metadata/cstore.rs index 886e46dc2a0..c1d3ad76260 100644 --- a/src/librustc/metadata/cstore.rs +++ b/src/librustc/metadata/cstore.rs @@ -18,7 +18,6 @@ use metadata::decoder; use metadata::loader; use std::cell::RefCell; -use std::vec::Vec; use std::c_vec::CVec; use collections::HashMap; use syntax::ast; diff --git a/src/librustc/metadata/decoder.rs b/src/librustc/metadata/decoder.rs index 449bda1eb5f..61d6b1d9d75 100644 --- a/src/librustc/metadata/decoder.rs +++ b/src/librustc/metadata/decoder.rs @@ -33,7 +33,6 @@ use std::io; use std::io::extensions::u64_from_be_bytes; use std::option; use std::rc::Rc; -use std::vec::Vec; use serialize::ebml::reader; use serialize::ebml; use serialize::Decodable; diff --git a/src/librustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs index a50cb1cbdba..9faa5610887 100644 --- a/src/librustc/metadata/encoder.rs +++ b/src/librustc/metadata/encoder.rs @@ -32,7 +32,6 @@ use std::hash; use std::hash::Hash; use std::io::MemWriter; use std::str; -use std::vec::Vec; use collections::HashMap; use syntax::abi::AbiSet; use syntax::ast::*; diff --git a/src/librustc/metadata/filesearch.rs b/src/librustc/metadata/filesearch.rs index 666f44c685f..f9ef4ebabdc 100644 --- a/src/librustc/metadata/filesearch.rs +++ b/src/librustc/metadata/filesearch.rs @@ -13,7 +13,6 @@ use std::cell::RefCell; use std::os; use std::io::fs; -use std::vec::Vec; use collections::HashSet; pub enum FileMatch { FileMatches, FileDoesntMatch } diff --git a/src/librustc/metadata/loader.rs b/src/librustc/metadata/loader.rs index 6a1e3663a54..2644ea301e3 100644 --- a/src/librustc/metadata/loader.rs +++ b/src/librustc/metadata/loader.rs @@ -31,7 +31,6 @@ use std::io; use std::os::consts::{macos, freebsd, linux, android, win32}; use std::str; use std::slice; -use std::vec::Vec; use collections::{HashMap, HashSet}; use flate; diff --git a/src/librustc/metadata/tydecode.rs b/src/librustc/metadata/tydecode.rs index a990310a648..1e9b98073fa 100644 --- a/src/librustc/metadata/tydecode.rs +++ b/src/librustc/metadata/tydecode.rs @@ -20,7 +20,6 @@ use middle::ty; use std::str; use std::uint; -use std::vec::Vec; use syntax::abi::AbiSet; use syntax::abi; use syntax::ast; diff --git a/src/librustc/metadata/tyencode.rs b/src/librustc/metadata/tyencode.rs index 911729cd68a..35014d4085a 100644 --- a/src/librustc/metadata/tyencode.rs +++ b/src/librustc/metadata/tyencode.rs @@ -19,7 +19,6 @@ use std::io; use std::io::MemWriter; use std::str; use std::fmt; -use std::vec::Vec; use middle::ty::param_ty; use middle::ty; diff --git a/src/librustc/middle/astencode.rs b/src/librustc/middle/astencode.rs index 5fea567fc7d..9abb35d5738 100644 --- a/src/librustc/middle/astencode.rs +++ b/src/librustc/middle/astencode.rs @@ -37,7 +37,6 @@ use std::cast; use std::cell::RefCell; use std::io::Seek; use std::rc::Rc; -use std::vec::Vec; use serialize::ebml::reader; use serialize::ebml; diff --git a/src/librustc/middle/borrowck/check_loans.rs b/src/librustc/middle/borrowck/check_loans.rs index 5db1324b3fe..6b8af3cbc53 100644 --- a/src/librustc/middle/borrowck/check_loans.rs +++ b/src/librustc/middle/borrowck/check_loans.rs @@ -23,7 +23,6 @@ use middle::borrowck::*; use middle::moves; use middle::ty; use middle::typeck::MethodCall; -use std::vec::Vec; use syntax::ast; use syntax::ast_util; use syntax::codemap::Span; diff --git a/src/librustc/middle/borrowck/gather_loans/mod.rs b/src/librustc/middle/borrowck/gather_loans/mod.rs index 6e98d282f8f..8ecac0a60be 100644 --- a/src/librustc/middle/borrowck/gather_loans/mod.rs +++ b/src/librustc/middle/borrowck/gather_loans/mod.rs @@ -27,7 +27,6 @@ use middle::typeck::MethodCall; use util::common::indenter; use util::ppaux::{Repr}; -use std::vec::Vec; use syntax::ast; use syntax::ast_util; use syntax::ast_util::IdRange; diff --git a/src/librustc/middle/borrowck/gather_loans/restrictions.rs b/src/librustc/middle/borrowck/gather_loans/restrictions.rs index fc5763b8841..39ec183da45 100644 --- a/src/librustc/middle/borrowck/gather_loans/restrictions.rs +++ b/src/librustc/middle/borrowck/gather_loans/restrictions.rs @@ -12,7 +12,6 @@ * Computes the restrictions that result from a borrow. */ -use std::vec::Vec; use std::vec; use middle::borrowck::*; use mc = middle::mem_categorization; diff --git a/src/librustc/middle/borrowck/mod.rs b/src/librustc/middle/borrowck/mod.rs index 1242fdbae6a..362553ccbf1 100644 --- a/src/librustc/middle/borrowck/mod.rs +++ b/src/librustc/middle/borrowck/mod.rs @@ -25,7 +25,6 @@ use std::cell::{Cell, RefCell}; use collections::HashMap; use std::ops::{BitOr, BitAnd}; use std::result::{Result}; -use std::vec::Vec; use syntax::ast; use syntax::ast_map; use syntax::ast_util; diff --git a/src/librustc/middle/borrowck/move_data.rs b/src/librustc/middle/borrowck/move_data.rs index 5b2cca047cc..de4059142e4 100644 --- a/src/librustc/middle/borrowck/move_data.rs +++ b/src/librustc/middle/borrowck/move_data.rs @@ -17,7 +17,6 @@ comments in the section "Moves and initialization" and in `doc.rs`. use std::cell::RefCell; use std::uint; -use std::vec::Vec; use collections::{HashMap, HashSet}; use middle::borrowck::*; use middle::dataflow::DataFlowContext; diff --git a/src/librustc/middle/cfg/construct.rs b/src/librustc/middle/cfg/construct.rs index 8fee8b1bf9d..a742ff336b2 100644 --- a/src/librustc/middle/cfg/construct.rs +++ b/src/librustc/middle/cfg/construct.rs @@ -12,7 +12,6 @@ use middle::cfg::*; use middle::graph; use middle::typeck; use middle::ty; -use std::vec::Vec; use syntax::ast; use syntax::ast_util; use syntax::opt_vec; diff --git a/src/librustc/middle/check_const.rs b/src/librustc/middle/check_const.rs index c6f114cfbc5..6bec35665fb 100644 --- a/src/librustc/middle/check_const.rs +++ b/src/librustc/middle/check_const.rs @@ -15,7 +15,6 @@ use middle::ty; use middle::typeck; use util::ppaux; -use std::vec::Vec; use syntax::ast::*; use syntax::{ast_util, ast_map}; use syntax::visit::Visitor; diff --git a/src/librustc/middle/check_match.rs b/src/librustc/middle/check_match.rs index fe4a58a62eb..9e74e9605da 100644 --- a/src/librustc/middle/check_match.rs +++ b/src/librustc/middle/check_match.rs @@ -21,7 +21,6 @@ use util::ppaux::ty_to_str; use std::cmp; use std::iter; -use std::vec::Vec; use std::vec; use syntax::ast::*; use syntax::ast_util::{unguarded_pat, walk_pat}; diff --git a/src/librustc/middle/const_eval.rs b/src/librustc/middle/const_eval.rs index 0507c2541d6..5f0db7b3821 100644 --- a/src/librustc/middle/const_eval.rs +++ b/src/librustc/middle/const_eval.rs @@ -26,7 +26,6 @@ use syntax::{ast, ast_map, ast_util}; use std::cell::RefCell; use collections::HashMap; use std::rc::Rc; -use std::vec::Vec; // // This pass classifies expressions by their constant-ness. diff --git a/src/librustc/middle/dataflow.rs b/src/librustc/middle/dataflow.rs index 949eabb30de..114bf3bae2c 100644 --- a/src/librustc/middle/dataflow.rs +++ b/src/librustc/middle/dataflow.rs @@ -20,7 +20,6 @@ use std::io; use std::uint; use std::slice; -use std::vec::Vec; use syntax::ast; use syntax::ast_util; use syntax::ast_util::IdRange; diff --git a/src/librustc/middle/dead.rs b/src/librustc/middle/dead.rs index 58b8b55a2a0..7004ce3f0d4 100644 --- a/src/librustc/middle/dead.rs +++ b/src/librustc/middle/dead.rs @@ -19,7 +19,6 @@ use middle::typeck; use util::nodemap::NodeSet; use collections::HashSet; -use std::vec::Vec; use syntax::ast; use syntax::ast_map; use syntax::ast_util::{local_def, def_id_of_def, is_local}; diff --git a/src/librustc/middle/entry.rs b/src/librustc/middle/entry.rs index 62e578886c5..7adfd6e0af0 100644 --- a/src/librustc/middle/entry.rs +++ b/src/librustc/middle/entry.rs @@ -11,7 +11,6 @@ use driver::session; use driver::session::Session; -use std::vec::Vec; use syntax::ast::{Crate, Name, NodeId, Item, ItemFn}; use syntax::ast_map; use syntax::attr; diff --git a/src/librustc/middle/freevars.rs b/src/librustc/middle/freevars.rs index af1d0c57237..d836f8e332b 100644 --- a/src/librustc/middle/freevars.rs +++ b/src/librustc/middle/freevars.rs @@ -17,7 +17,6 @@ use middle::resolve; use middle::ty; use util::nodemap::{NodeMap, NodeSet}; -use std::vec::Vec; use syntax::codemap::Span; use syntax::{ast, ast_util}; use syntax::visit; diff --git a/src/librustc/middle/graph.rs b/src/librustc/middle/graph.rs index 8f2cbb4d241..66539c63d53 100644 --- a/src/librustc/middle/graph.rs +++ b/src/librustc/middle/graph.rs @@ -35,7 +35,6 @@ be indexed by the direction (see the type `Direction`). */ use std::uint; -use std::vec::Vec; pub struct Graph<N,E> { priv nodes: Vec<Node<N>> , diff --git a/src/librustc/middle/kind.rs b/src/librustc/middle/kind.rs index 5c79020505a..d9843ba36cc 100644 --- a/src/librustc/middle/kind.rs +++ b/src/librustc/middle/kind.rs @@ -16,7 +16,6 @@ use middle::typeck; use util::ppaux::{Repr, ty_to_str}; use util::ppaux::UserString; -use std::vec::Vec; use syntax::ast::*; use syntax::attr; use syntax::codemap::Span; diff --git a/src/librustc/middle/lang_items.rs b/src/librustc/middle/lang_items.rs index 193c924f4e4..2a1cb6f5a8f 100644 --- a/src/librustc/middle/lang_items.rs +++ b/src/librustc/middle/lang_items.rs @@ -33,7 +33,6 @@ use syntax::visit; use collections::HashMap; use std::iter::Enumerate; use std::slice; -use std::vec::Vec; // The actual lang items defined come at the end of this file in one handy table. // So you probably just want to nip down to the end. diff --git a/src/librustc/middle/lint.rs b/src/librustc/middle/lint.rs index d3ead2efeee..6c13d496166 100644 --- a/src/librustc/middle/lint.rs +++ b/src/librustc/middle/lint.rs @@ -58,7 +58,6 @@ use std::u16; use std::u32; use std::u64; use std::u8; -use std::vec::Vec; use collections::SmallIntMap; use syntax::ast_map; use syntax::ast_util::IdVisitingOperation; diff --git a/src/librustc/middle/liveness.rs b/src/librustc/middle/liveness.rs index ee526f81c28..5e8bee803f3 100644 --- a/src/librustc/middle/liveness.rs +++ b/src/librustc/middle/liveness.rs @@ -116,7 +116,6 @@ use std::io; use std::rc::Rc; use std::str; use std::uint; -use std::vec::Vec; use syntax::ast::*; use syntax::codemap::Span; use syntax::parse::token::special_idents; diff --git a/src/librustc/middle/mem_categorization.rs b/src/librustc/middle/mem_categorization.rs index 04d4b4c67de..895fff1df5c 100644 --- a/src/librustc/middle/mem_categorization.rs +++ b/src/librustc/middle/mem_categorization.rs @@ -66,7 +66,6 @@ use middle::ty; use middle::typeck; use util::ppaux::{ty_to_str, region_ptr_to_str, Repr}; -use std::vec::Vec; use syntax::ast::{MutImmutable, MutMutable}; use syntax::ast; use syntax::codemap::Span; diff --git a/src/librustc/middle/moves.rs b/src/librustc/middle/moves.rs index 0135b8d360b..fb0aa1e405c 100644 --- a/src/librustc/middle/moves.rs +++ b/src/librustc/middle/moves.rs @@ -138,7 +138,6 @@ use util::ppaux::UserString; use util::nodemap::{NodeMap, NodeSet}; use std::rc::Rc; -use std::vec::Vec; use syntax::ast::*; use syntax::ast_util; use syntax::visit; diff --git a/src/librustc/middle/pat_util.rs b/src/librustc/middle/pat_util.rs index 431f2820d6e..36c6c190284 100644 --- a/src/librustc/middle/pat_util.rs +++ b/src/librustc/middle/pat_util.rs @@ -12,7 +12,6 @@ use middle::resolve; use collections::HashMap; -use std::vec::Vec; use syntax::ast::*; use syntax::ast_util::{path_to_ident, walk_pat}; use syntax::codemap::Span; diff --git a/src/librustc/middle/privacy.rs b/src/librustc/middle/privacy.rs index e4f5b175836..6dd4eb360f2 100644 --- a/src/librustc/middle/privacy.rs +++ b/src/librustc/middle/privacy.rs @@ -13,7 +13,6 @@ //! which are available for use externally when compiled as a library. use std::mem::replace; -use std::vec::Vec; use metadata::csearch; use middle::lint; diff --git a/src/librustc/middle/reachable.rs b/src/librustc/middle/reachable.rs index a0ca416380f..97f492ae73d 100644 --- a/src/librustc/middle/reachable.rs +++ b/src/librustc/middle/reachable.rs @@ -20,7 +20,6 @@ use middle::typeck; use middle::privacy; use util::nodemap::NodeSet; -use std::vec::Vec; use collections::HashSet; use syntax::ast; use syntax::ast_map; diff --git a/src/librustc/middle/region.rs b/src/librustc/middle/region.rs index c0218429bb1..a1f74aaee4e 100644 --- a/src/librustc/middle/region.rs +++ b/src/librustc/middle/region.rs @@ -27,7 +27,6 @@ use middle::ty; use util::nodemap::NodeMap; use std::cell::RefCell; -use std::vec::Vec; use collections::{HashMap, HashSet}; use syntax::codemap::Span; use syntax::{ast, visit}; diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs index 10f0002ea46..86180a04297 100644 --- a/src/librustc/middle/resolve.rs +++ b/src/librustc/middle/resolve.rs @@ -34,7 +34,6 @@ use syntax::visit::Visitor; use std::cell::{Cell, RefCell}; use std::uint; use std::mem::replace; -use std::vec::Vec; use collections::{HashMap, HashSet}; // Definition mapping diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs index 5d77d437bb9..49d8c5acb17 100644 --- a/src/librustc/middle/resolve_lifetime.rs +++ b/src/librustc/middle/resolve_lifetime.rs @@ -18,7 +18,6 @@ */ use driver::session::Session; -use std::vec::Vec; use util::nodemap::NodeMap; use syntax::ast; use syntax::codemap::Span; diff --git a/src/librustc/middle/subst.rs b/src/librustc/middle/subst.rs index 25a2763ed2b..43a6b2c46a5 100644 --- a/src/librustc/middle/subst.rs +++ b/src/librustc/middle/subst.rs @@ -16,7 +16,6 @@ use middle::ty_fold::TypeFolder; use util::ppaux::Repr; use std::rc::Rc; -use std::vec::Vec; use syntax::codemap::Span; use syntax::opt_vec::OptVec; diff --git a/src/librustc/middle/trans/_match.rs b/src/librustc/middle/trans/_match.rs index 060cb692bce..31296ba260b 100644 --- a/src/librustc/middle/trans/_match.rs +++ b/src/librustc/middle/trans/_match.rs @@ -225,7 +225,6 @@ use util::ppaux::{Repr, vec_map_to_str}; use collections::HashMap; use std::cell::Cell; -use std::vec::Vec; use std::vec; use syntax::ast; use syntax::ast::Ident; diff --git a/src/librustc/middle/trans/adt.rs b/src/librustc/middle/trans/adt.rs index 7248792a51f..8ec061fc2f5 100644 --- a/src/librustc/middle/trans/adt.rs +++ b/src/librustc/middle/trans/adt.rs @@ -57,7 +57,6 @@ use middle::trans::type_::Type; use middle::trans::type_of; use middle::ty; use middle::ty::Disr; -use std::vec::Vec; use std::vec; use syntax::abi::{X86, X86_64, Arm, Mips}; use syntax::ast; diff --git a/src/librustc/middle/trans/asm.rs b/src/librustc/middle/trans/asm.rs index 9624b58f566..f4ce7c3c6a6 100644 --- a/src/librustc/middle/trans/asm.rs +++ b/src/librustc/middle/trans/asm.rs @@ -23,7 +23,6 @@ use middle::trans::type_of; use middle::trans::type_::Type; use std::c_str::ToCStr; -use std::vec::Vec; use syntax::ast; // Take an inline assembly expression and splat it out via LLVM diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs index 20881eb243a..3cdbc38ab07 100644 --- a/src/librustc/middle/trans/base.rs +++ b/src/librustc/middle/trans/base.rs @@ -76,7 +76,6 @@ use std::c_str::ToCStr; use std::cell::{Cell, RefCell}; use std::libc::c_uint; use std::local_data; -use std::vec::Vec; use syntax::abi::{X86, X86_64, Arm, Mips, Rust, RustIntrinsic, OsWin32}; use syntax::ast_map::PathName; use syntax::ast_util::{local_def, is_local}; diff --git a/src/librustc/middle/trans/builder.rs b/src/librustc/middle/trans/builder.rs index 9b071807429..059582e95d4 100644 --- a/src/librustc/middle/trans/builder.rs +++ b/src/librustc/middle/trans/builder.rs @@ -20,7 +20,6 @@ use middle::trans::type_::Type; use collections::HashMap; use std::libc::{c_uint, c_ulonglong, c_char}; -use std::vec::Vec; use syntax::codemap::Span; pub struct Builder<'a> { diff --git a/src/librustc/middle/trans/cabi.rs b/src/librustc/middle/trans/cabi.rs index 79fdd737135..ddd9f11034d 100644 --- a/src/librustc/middle/trans/cabi.rs +++ b/src/librustc/middle/trans/cabi.rs @@ -16,7 +16,6 @@ use middle::trans::cabi_x86_64; use middle::trans::cabi_arm; use middle::trans::cabi_mips; use middle::trans::type_::Type; -use std::vec::Vec; use syntax::abi::{X86, X86_64, Arm, Mips}; #[deriving(Clone, Eq)] diff --git a/src/librustc/middle/trans/cabi_arm.rs b/src/librustc/middle/trans/cabi_arm.rs index 94e2a50c620..5dc9a915746 100644 --- a/src/librustc/middle/trans/cabi_arm.rs +++ b/src/librustc/middle/trans/cabi_arm.rs @@ -17,8 +17,6 @@ use middle::trans::context::CrateContext; use middle::trans::type_::Type; use std::cmp; -use std::option::{None, Some}; -use std::vec::Vec; fn align_up_to(off: uint, a: uint) -> uint { return (off + a - 1u) / a * a; diff --git a/src/librustc/middle/trans/cabi_mips.rs b/src/librustc/middle/trans/cabi_mips.rs index 7e94bf8e666..a3732075855 100644 --- a/src/librustc/middle/trans/cabi_mips.rs +++ b/src/librustc/middle/trans/cabi_mips.rs @@ -18,8 +18,6 @@ use middle::trans::context::CrateContext; use middle::trans::cabi::*; use middle::trans::type_::Type; -use std::vec::Vec; - fn align_up_to(off: uint, a: uint) -> uint { return (off + a - 1u) / a * a; } diff --git a/src/librustc/middle/trans/cabi_x86.rs b/src/librustc/middle/trans/cabi_x86.rs index 243a9dffdc6..93b6fdd8988 100644 --- a/src/librustc/middle/trans/cabi_x86.rs +++ b/src/librustc/middle/trans/cabi_x86.rs @@ -15,7 +15,6 @@ use super::cabi::*; use super::common::*; use super::machine::*; use middle::trans::type_::Type; -use std::vec::Vec; pub fn compute_abi_info(ccx: &CrateContext, atys: &[Type], diff --git a/src/librustc/middle/trans/cabi_x86_64.rs b/src/librustc/middle/trans/cabi_x86_64.rs index bf9c969b7ef..dbb258ea399 100644 --- a/src/librustc/middle/trans/cabi_x86_64.rs +++ b/src/librustc/middle/trans/cabi_x86_64.rs @@ -21,7 +21,6 @@ use middle::trans::context::CrateContext; use middle::trans::type_::Type; use std::cmp; -use std::vec::Vec; #[deriving(Clone, Eq)] enum RegClass { diff --git a/src/librustc/middle/trans/callee.rs b/src/librustc/middle/trans/callee.rs index 5af126615a1..78ecc7cc2b3 100644 --- a/src/librustc/middle/trans/callee.rs +++ b/src/librustc/middle/trans/callee.rs @@ -49,7 +49,6 @@ use util::ppaux::Repr; use middle::trans::type_::Type; -use std::vec::Vec; use std::vec; use syntax::ast; use syntax::abi::AbiSet; diff --git a/src/librustc/middle/trans/closure.rs b/src/librustc/middle/trans/closure.rs index daeafe4c897..8b4348a8fcb 100644 --- a/src/librustc/middle/trans/closure.rs +++ b/src/librustc/middle/trans/closure.rs @@ -27,7 +27,6 @@ use util::ppaux::Repr; use util::ppaux::ty_to_str; use arena::TypedArena; -use std::vec::Vec; use syntax::ast; use syntax::ast_util; diff --git a/src/librustc/middle/trans/common.rs b/src/librustc/middle/trans/common.rs index cb01d187957..40ab85a91bf 100644 --- a/src/librustc/middle/trans/common.rs +++ b/src/librustc/middle/trans/common.rs @@ -35,7 +35,6 @@ use collections::HashMap; use std::c_str::ToCStr; use std::cell::{Cell, RefCell}; use std::libc::{c_uint, c_longlong, c_ulonglong, c_char}; -use std::vec::Vec; use syntax::ast::Ident; use syntax::ast; use syntax::ast_map::{PathElem, PathName}; diff --git a/src/librustc/middle/trans/context.rs b/src/librustc/middle/trans/context.rs index 73869aa4622..c542556c48f 100644 --- a/src/librustc/middle/trans/context.rs +++ b/src/librustc/middle/trans/context.rs @@ -33,7 +33,6 @@ use std::cell::{Cell, RefCell}; use std::c_str::ToCStr; use std::libc::c_uint; use std::ptr; -use std::vec::Vec; use collections::{HashMap, HashSet}; use syntax::ast; use syntax::parse::token::InternedString; diff --git a/src/librustc/middle/trans/debuginfo.rs b/src/librustc/middle/trans/debuginfo.rs index dc4a6e37c3e..313ee8b592b 100644 --- a/src/librustc/middle/trans/debuginfo.rs +++ b/src/librustc/middle/trans/debuginfo.rs @@ -149,7 +149,6 @@ use std::libc::{c_uint, c_ulonglong, c_longlong}; use std::ptr; use std::sync::atomics; use std::slice; -use std::vec::Vec; use syntax::codemap::{Span, Pos}; use syntax::{abi, ast, codemap, ast_util, ast_map, opt_vec}; use syntax::parse::token; diff --git a/src/librustc/middle/trans/expr.rs b/src/librustc/middle/trans/expr.rs index 75b14c081f9..543f2bcf968 100644 --- a/src/librustc/middle/trans/expr.rs +++ b/src/librustc/middle/trans/expr.rs @@ -71,7 +71,6 @@ use middle::trans::machine::llsize_of; use middle::trans::type_::Type; use std::slice; -use std::vec::Vec; use syntax::ast; use syntax::codemap; use syntax::print::pprust::{expr_to_str}; diff --git a/src/librustc/middle/trans/foreign.rs b/src/librustc/middle/trans/foreign.rs index be9888a61d7..3c808cf4232 100644 --- a/src/librustc/middle/trans/foreign.rs +++ b/src/librustc/middle/trans/foreign.rs @@ -27,7 +27,6 @@ use middle::ty::FnSig; use middle::ty; use std::cmp; use std::libc::c_uint; -use std::vec::Vec; use syntax::abi::{Cdecl, Aapcs, C, AbiSet, Win64}; use syntax::abi::{RustIntrinsic, Rust, Stdcall, Fastcall, System}; use syntax::codemap::Span; diff --git a/src/librustc/middle/trans/intrinsic.rs b/src/librustc/middle/trans/intrinsic.rs index e7ccb52108f..9618d082068 100644 --- a/src/librustc/middle/trans/intrinsic.rs +++ b/src/librustc/middle/trans/intrinsic.rs @@ -25,7 +25,6 @@ use middle::trans::machine; use middle::trans::machine::llsize_of; use middle::trans::type_::Type; use middle::ty; -use std::vec::Vec; use syntax::ast; use syntax::ast_map; use syntax::parse::token; diff --git a/src/librustc/middle/trans/meth.rs b/src/librustc/middle/trans/meth.rs index b248bf39645..918037e2181 100644 --- a/src/librustc/middle/trans/meth.rs +++ b/src/librustc/middle/trans/meth.rs @@ -34,7 +34,6 @@ use util::common::indenter; use util::ppaux::Repr; use std::c_str::ToCStr; -use std::vec::Vec; use std::vec; use syntax::parse::token; use syntax::{ast, ast_map, visit}; diff --git a/src/librustc/middle/trans/monomorphize.rs b/src/librustc/middle/trans/monomorphize.rs index aed1f1b24d0..85c0e38e0f6 100644 --- a/src/librustc/middle/trans/monomorphize.rs +++ b/src/librustc/middle/trans/monomorphize.rs @@ -23,7 +23,6 @@ use middle::ty; use middle::typeck; use util::ppaux::Repr; -use std::vec::Vec; use syntax::ast; use syntax::ast_map; use syntax::ast_util::local_def; diff --git a/src/librustc/middle/trans/reflect.rs b/src/librustc/middle/trans/reflect.rs index 833f33c720a..a0c1b0c042a 100644 --- a/src/librustc/middle/trans/reflect.rs +++ b/src/librustc/middle/trans/reflect.rs @@ -27,8 +27,6 @@ use util::ppaux::ty_to_str; use arena::TypedArena; use std::libc::c_uint; -use std::option::{Some,None}; -use std::vec::Vec; use std::vec; use syntax::ast::DefId; use syntax::ast; diff --git a/src/librustc/middle/trans/type_.rs b/src/librustc/middle/trans/type_.rs index 2a0c65216a7..7155c73c002 100644 --- a/src/librustc/middle/trans/type_.rs +++ b/src/librustc/middle/trans/type_.rs @@ -21,7 +21,6 @@ use syntax::abi::{X86, X86_64, Arm, Mips}; use std::c_str::ToCStr; use std::cast; use std::slice; -use std::vec::Vec; use std::libc::{c_uint}; diff --git a/src/librustc/middle/trans/type_of.rs b/src/librustc/middle/trans/type_of.rs index c8f8df17a74..6b02339577e 100644 --- a/src/librustc/middle/trans/type_of.rs +++ b/src/librustc/middle/trans/type_of.rs @@ -19,7 +19,6 @@ use util::ppaux::Repr; use middle::trans::type_::Type; -use std::vec::Vec; use syntax::ast; use syntax::opt_vec; diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index 6dc31f7fdaa..a153aa48219 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -40,7 +40,6 @@ use std::fmt; use std::hash::{Hash, sip}; use std::ops; use std::rc::Rc; -use std::vec::Vec; use std::vec; use collections::{HashMap, HashSet}; use syntax::ast::*; diff --git a/src/librustc/middle/ty_fold.rs b/src/librustc/middle/ty_fold.rs index caec263389f..88262e8ee73 100644 --- a/src/librustc/middle/ty_fold.rs +++ b/src/librustc/middle/ty_fold.rs @@ -13,8 +13,6 @@ use middle::ty; use util::ppaux::Repr; -use std::vec::Vec; - pub trait TypeFolder { fn tcx<'a>(&'a self) -> &'a ty::ctxt; diff --git a/src/librustc/middle/typeck/astconv.rs b/src/librustc/middle/typeck/astconv.rs index 177cadbce46..be7668eaf40 100644 --- a/src/librustc/middle/typeck/astconv.rs +++ b/src/librustc/middle/typeck/astconv.rs @@ -60,7 +60,6 @@ use middle::typeck::rscope::{RegionScope}; use middle::typeck::lookup_def_tcx; use util::ppaux::Repr; -use std::vec::Vec; use syntax::abi::AbiSet; use syntax::{ast, ast_util}; use syntax::codemap::Span; diff --git a/src/librustc/middle/typeck/check/_match.rs b/src/librustc/middle/typeck/check/_match.rs index 8ba2c63ecb1..3e6cb5a1889 100644 --- a/src/librustc/middle/typeck/check/_match.rs +++ b/src/librustc/middle/typeck/check/_match.rs @@ -20,7 +20,6 @@ use middle::typeck::infer; use middle::typeck::require_same_types; use collections::{HashMap, HashSet}; -use std::vec::Vec; use syntax::ast; use syntax::ast_util; use syntax::parse::token; diff --git a/src/librustc/middle/typeck/check/method.rs b/src/librustc/middle/typeck/check/method.rs index 0a95a891398..055a996e8ec 100644 --- a/src/librustc/middle/typeck/check/method.rs +++ b/src/librustc/middle/typeck/check/method.rs @@ -97,7 +97,6 @@ use util::ppaux::Repr; use collections::HashSet; use std::result; -use std::vec::Vec; use std::vec; use syntax::ast::{DefId, SelfValue, SelfRegion}; use syntax::ast::{SelfUniq, SelfStatic}; diff --git a/src/librustc/middle/typeck/check/regionmanip.rs b/src/librustc/middle/typeck/check/regionmanip.rs index 479a1e94b67..8f59bb28000 100644 --- a/src/librustc/middle/typeck/check/regionmanip.rs +++ b/src/librustc/middle/typeck/check/regionmanip.rs @@ -15,7 +15,6 @@ use middle::ty_fold; use middle::ty_fold::TypeFolder; use collections::HashMap; -use std::vec::Vec; use util::ppaux::Repr; use util::ppaux; diff --git a/src/librustc/middle/typeck/check/vtable.rs b/src/librustc/middle/typeck/check/vtable.rs index 9d181b27b4f..e3c6db17081 100644 --- a/src/librustc/middle/typeck/check/vtable.rs +++ b/src/librustc/middle/typeck/check/vtable.rs @@ -30,7 +30,6 @@ use util::ppaux::Repr; use collections::HashSet; use std::cell::RefCell; use std::result; -use std::vec::Vec; use syntax::ast; use syntax::ast_util; use syntax::codemap::Span; diff --git a/src/librustc/middle/typeck/check/writeback.rs b/src/librustc/middle/typeck/check/writeback.rs index e68fb5c7f13..669f14ccb8c 100644 --- a/src/librustc/middle/typeck/check/writeback.rs +++ b/src/librustc/middle/typeck/check/writeback.rs @@ -28,7 +28,6 @@ use middle::typeck::write_ty_to_tcx; use util::ppaux; use util::ppaux::Repr; -use std::vec::Vec; use syntax::ast; use syntax::codemap::Span; use syntax::print::pprust::pat_to_str; diff --git a/src/librustc/middle/typeck/coherence.rs b/src/librustc/middle/typeck/coherence.rs index c50f15ed816..c75e56914b2 100644 --- a/src/librustc/middle/typeck/coherence.rs +++ b/src/librustc/middle/typeck/coherence.rs @@ -48,7 +48,6 @@ use syntax::visit; use collections::HashSet; use std::cell::RefCell; use std::rc::Rc; -use std::vec::Vec; use std::vec; struct UniversalQuantificationResult { diff --git a/src/librustc/middle/typeck/collect.rs b/src/librustc/middle/typeck/collect.rs index 6d15b3fd1f0..ec460f8c6b5 100644 --- a/src/librustc/middle/typeck/collect.rs +++ b/src/librustc/middle/typeck/collect.rs @@ -46,7 +46,6 @@ use util::ppaux; use util::ppaux::Repr; use std::rc::Rc; -use std::vec::Vec; use std::vec; use collections::HashSet; diff --git a/src/librustc/middle/typeck/infer/combine.rs b/src/librustc/middle/typeck/infer/combine.rs index 5b52a3551dd..2af6ed0266a 100644 --- a/src/librustc/middle/typeck/infer/combine.rs +++ b/src/librustc/middle/typeck/infer/combine.rs @@ -63,7 +63,7 @@ use util::common::indent; use util::ppaux::Repr; use std::result; -use std::vec::Vec; + use syntax::ast::{Onceness, Purity}; use syntax::ast; use syntax::opt_vec; diff --git a/src/librustc/middle/typeck/infer/error_reporting.rs b/src/librustc/middle/typeck/infer/error_reporting.rs index 1f6708a6f5c..53c39068fb9 100644 --- a/src/librustc/middle/typeck/infer/error_reporting.rs +++ b/src/librustc/middle/typeck/infer/error_reporting.rs @@ -76,7 +76,6 @@ use middle::typeck::infer::region_inference::ProcessedErrors; use middle::typeck::infer::region_inference::SameRegions; use std::cell::{Cell, RefCell}; use std::char::from_u32; -use std::vec::Vec; use syntax::ast; use syntax::ast_map; use syntax::ast_util; diff --git a/src/librustc/middle/typeck/infer/lattice.rs b/src/librustc/middle/typeck/infer/lattice.rs index ce344c9d561..000d2843cca 100644 --- a/src/librustc/middle/typeck/infer/lattice.rs +++ b/src/librustc/middle/typeck/infer/lattice.rs @@ -46,7 +46,6 @@ use middle::typeck::infer::to_str::InferStr; use util::common::indenter; use collections::HashMap; -use std::vec::Vec; pub trait LatticeValue { fn sub(cf: &CombineFields, a: &Self, b: &Self) -> ures; diff --git a/src/librustc/middle/typeck/infer/mod.rs b/src/librustc/middle/typeck/infer/mod.rs index ccc589f0eef..923822039b1 100644 --- a/src/librustc/middle/typeck/infer/mod.rs +++ b/src/librustc/middle/typeck/infer/mod.rs @@ -39,7 +39,6 @@ use middle::typeck::infer::unify::{ValsAndBindings, Root}; use middle::typeck::infer::error_reporting::ErrorReporting; use std::cell::{Cell, RefCell}; use std::result; -use std::vec::Vec; use syntax::ast::{MutImmutable, MutMutable}; use syntax::ast; use syntax::codemap; diff --git a/src/librustc/middle/typeck/infer/region_inference/mod.rs b/src/librustc/middle/typeck/infer/region_inference/mod.rs index 6019de0b2d9..7d2159b5b68 100644 --- a/src/librustc/middle/typeck/infer/region_inference/mod.rs +++ b/src/librustc/middle/typeck/infer/region_inference/mod.rs @@ -27,7 +27,6 @@ use util::ppaux::{Repr}; use std::cell::{Cell, RefCell}; use std::uint; use std::slice; -use std::vec::Vec; use collections::{HashMap, HashSet}; use syntax::ast; use syntax::opt_vec; diff --git a/src/librustc/middle/typeck/infer/resolve.rs b/src/librustc/middle/typeck/infer/resolve.rs index 929b4ac433c..4bc0e765af5 100644 --- a/src/librustc/middle/typeck/infer/resolve.rs +++ b/src/librustc/middle/typeck/infer/resolve.rs @@ -58,7 +58,6 @@ use middle::typeck::infer::unify::{Root, UnifyInferCtxtMethods}; use util::common::{indent, indenter}; use util::ppaux::ty_to_str; -use std::vec::Vec; use syntax::ast; pub static resolve_nested_tvar: uint = 0b0000000001; diff --git a/src/librustc/middle/typeck/infer/unify.rs b/src/librustc/middle/typeck/infer/unify.rs index a5c95bbfd5a..1c2ca2799ac 100644 --- a/src/librustc/middle/typeck/infer/unify.rs +++ b/src/librustc/middle/typeck/infer/unify.rs @@ -17,7 +17,6 @@ use middle::typeck::infer::{Bounds, uok, ures}; use middle::typeck::infer::InferCtxt; use middle::typeck::infer::to_str::InferStr; use std::cell::RefCell; -use std::vec::Vec; use syntax::ast; #[deriving(Clone)] diff --git a/src/librustc/middle/typeck/mod.rs b/src/librustc/middle/typeck/mod.rs index 28e5559b32b..66314e14154 100644 --- a/src/librustc/middle/typeck/mod.rs +++ b/src/librustc/middle/typeck/mod.rs @@ -72,7 +72,6 @@ use util::nodemap::{DefIdMap, FnvHashMap, NodeMap}; use std::cell::RefCell; use std::rc::Rc; -use std::vec::Vec; use collections::List; use syntax::codemap::Span; use syntax::print::pprust::*; diff --git a/src/librustc/middle/typeck/rscope.rs b/src/librustc/middle/typeck/rscope.rs index 3ead54ee9f5..995d3589c20 100644 --- a/src/librustc/middle/typeck/rscope.rs +++ b/src/librustc/middle/typeck/rscope.rs @@ -12,7 +12,6 @@ use middle::ty; use std::cell::Cell; -use std::vec::Vec; use syntax::ast; use syntax::codemap::Span; use syntax::opt_vec::OptVec; diff --git a/src/librustc/middle/typeck/variance.rs b/src/librustc/middle/typeck/variance.rs index 90bb1eb59a9..db74ad99d81 100644 --- a/src/librustc/middle/typeck/variance.rs +++ b/src/librustc/middle/typeck/variance.rs @@ -197,7 +197,6 @@ use arena; use arena::Arena; use middle::ty; use std::fmt; -use std::vec::Vec; use syntax::ast; use syntax::ast_util; use syntax::opt_vec; diff --git a/src/librustc/util/common.rs b/src/librustc/util/common.rs index 03f73f9ae9e..732723fec9c 100644 --- a/src/librustc/util/common.rs +++ b/src/librustc/util/common.rs @@ -16,7 +16,6 @@ use syntax::visit; use syntax::visit::Visitor; use std::local_data; -use std::vec::Vec; use time; diff --git a/src/librustc/util/ppaux.rs b/src/librustc/util/ppaux.rs index e43eed9f219..4e0a9c3fc3d 100644 --- a/src/librustc/util/ppaux.rs +++ b/src/librustc/util/ppaux.rs @@ -23,7 +23,6 @@ use middle::ty::{ty_uniq, ty_trait, ty_int, ty_uint, ty_unboxed_vec, ty_infer}; use middle::ty; use middle::typeck; -use std::vec::Vec; use syntax::abi::AbiSet; use syntax::ast_map; use syntax::codemap::{Span, Pos}; diff --git a/src/librustc/util/sha2.rs b/src/librustc/util/sha2.rs index afc061ba813..75d6f1f5cd1 100644 --- a/src/librustc/util/sha2.rs +++ b/src/librustc/util/sha2.rs @@ -15,7 +15,6 @@ use std::iter::range_step; use std::num::Zero; use std::slice::bytes::{MutableByteVector, copy_memory}; -use std::vec::Vec; use serialize::hex::ToHex; /// Write a u32 into a vector, which must be 4 bytes long. The value is written in big-endian @@ -529,7 +528,6 @@ mod tests { use super::{Digest, Sha256, FixedBuffer}; use std::num::Bounded; use std::slice; - use std::vec::Vec; use self::rand::isaac::IsaacRng; use self::rand::Rng; use serialize::hex::FromHex; diff --git a/src/librustdoc/clean.rs b/src/librustdoc/clean.rs index 6402ed1c9f8..57b381d915a 100644 --- a/src/librustdoc/clean.rs +++ b/src/librustdoc/clean.rs @@ -30,7 +30,6 @@ use core; use doctree; use visit_ast; use std::local_data; -use std::vec::Vec; pub trait Clean<T> { fn clean(&self) -> T; diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index bfc3555f16a..6bbe22402d1 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -39,7 +39,6 @@ use std::io; use std::io::{fs, File, BufferedWriter, MemWriter, BufferedReader}; use std::str; use std::slice; -use std::vec::Vec; use collections::{HashMap, HashSet}; use sync::Arc; diff --git a/src/librustdoc/html/toc.rs b/src/librustdoc/html/toc.rs index db694a26a56..f8d91fffb1f 100644 --- a/src/librustdoc/html/toc.rs +++ b/src/librustdoc/html/toc.rs @@ -11,7 +11,6 @@ //! Table-of-contents creation. use std::fmt; -use std::vec::Vec; /// A (recursive) table of contents #[deriving(Eq)] diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index 6dc3c2073f1..069ab37a2ad 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -14,7 +14,6 @@ #[crate_type = "dylib"]; #[crate_type = "rlib"]; -#[allow(deprecated_owned_vector)]; #[feature(globs, struct_variant, managed_boxes, macro_rules, phase)]; extern crate syntax; diff --git a/src/librustdoc/markdown.rs b/src/librustdoc/markdown.rs index 1ed0c57b854..f8ebfae6cfb 100644 --- a/src/librustdoc/markdown.rs +++ b/src/librustdoc/markdown.rs @@ -9,7 +9,6 @@ // except according to those terms. use std::{str, io}; -use std::vec::Vec; use collections::HashSet; diff --git a/src/librustdoc/visit_ast.rs b/src/librustdoc/visit_ast.rs index 1398926827d..cd8cc8bde6a 100644 --- a/src/librustdoc/visit_ast.rs +++ b/src/librustdoc/visit_ast.rs @@ -11,7 +11,6 @@ //! Rust AST Visitor. Extracts useful information and massages it into a form //! usable for clean -use std::vec::Vec; use syntax::abi::AbiSet; use syntax::ast; use syntax::ast_util; diff --git a/src/librustuv/lib.rs b/src/librustuv/lib.rs index e2d13d65da0..890f44faabc 100644 --- a/src/librustuv/lib.rs +++ b/src/librustuv/lib.rs @@ -42,7 +42,6 @@ via `close` and `delete` methods. #[feature(macro_rules)]; #[deny(unused_result, unused_must_use)]; #[allow(visible_private_types)]; -#[allow(deprecated_owned_vector)]; #[cfg(test)] extern crate green; diff --git a/src/libsemver/lib.rs b/src/libsemver/lib.rs index 4ff19393790..707b9c0ba74 100644 --- a/src/libsemver/lib.rs +++ b/src/libsemver/lib.rs @@ -41,7 +41,6 @@ use std::cmp; use std::fmt; use std::fmt::Show; use std::option::{Option, Some, None}; -use std::vec::Vec; /// An identifier in the pre-release or build metadata. If the identifier can /// be parsed as a decimal value, it will be represented with `Numeric`. diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs index c27c5542ce1..3d4a7cd909a 100644 --- a/src/libserialize/lib.rs +++ b/src/libserialize/lib.rs @@ -28,7 +28,6 @@ Core encoding and decoding interfaces. // NOTE remove the following two attributes after the next snapshot. #[allow(unrecognized_lint)]; #[allow(default_type_param_usage)]; -#[allow(deprecated_owned_vector)]; // test harness access #[cfg(test)] diff --git a/src/libserialize/serialize.rs b/src/libserialize/serialize.rs index 18692de2cb4..60de03a7b43 100644 --- a/src/libserialize/serialize.rs +++ b/src/libserialize/serialize.rs @@ -17,7 +17,6 @@ Core encoding and decoding interfaces. use std::path; use std::rc::Rc; use std::slice; -use std::vec::Vec; pub trait Encoder { // Primitive types: diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 0431a80d0c4..583510a7e80 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -65,7 +65,6 @@ #[deny(non_camel_case_types)]; #[deny(missing_doc)]; #[allow(unknown_features)]; -#[allow(deprecated_owned_vector)]; // When testing libstd, bring in libuv as the I/O backend so tests can print // things and all of the std::io tests have an I/O interface to run on top diff --git a/src/libsync/lib.rs b/src/libsync/lib.rs index d4593318eaf..70874a029ac 100644 --- a/src/libsync/lib.rs +++ b/src/libsync/lib.rs @@ -21,8 +21,6 @@ html_root_url = "http://static.rust-lang.org/doc/master")]; #[feature(phase)]; -#[allow(deprecated_owned_vector)]; - #[cfg(test)] #[phase(syntax, link)] extern crate log; pub use arc::{Arc, MutexArc, RWArc, RWWriteMode, RWReadMode, ArcCondvar, CowArc}; diff --git a/src/libsyntax/abi.rs b/src/libsyntax/abi.rs index 0547b374edb..b159920d929 100644 --- a/src/libsyntax/abi.rs +++ b/src/libsyntax/abi.rs @@ -9,7 +9,6 @@ // except according to those terms. use std::fmt; -use std::vec::Vec; use std::fmt::Show; #[deriving(Eq)] diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index fce9ddcc2ee..d1d9ae2322d 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -21,7 +21,6 @@ use std::fmt; use std::fmt::Show; use std::option::Option; use std::rc::Rc; -use std::vec::Vec; use serialize::{Encodable, Decodable, Encoder, Decoder}; /// A pointer abstraction. FIXME(eddyb) #10676 use Rc<T> in the future. @@ -1157,7 +1156,13 @@ mod test { use codemap::*; use super::*; - use std::vec::Vec; + fn is_freeze<T: Freeze>() {} + + // Assert that the AST remains Freeze (#10693). + #[test] + fn ast_is_freeze() { + is_freeze::<Item>(); + } // are ASTs encodable? #[test] diff --git a/src/libsyntax/ast_map.rs b/src/libsyntax/ast_map.rs index d1b13d93856..0b9bf43f0ef 100644 --- a/src/libsyntax/ast_map.rs +++ b/src/libsyntax/ast_map.rs @@ -22,7 +22,6 @@ use std::cell::RefCell; use std::iter; use std::slice; use std::fmt; -use std::vec::Vec; #[deriving(Clone, Eq)] pub enum PathElem { diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs index b75a49b2097..656ca1c88ba 100644 --- a/src/libsyntax/ast_util.rs +++ b/src/libsyntax/ast_util.rs @@ -22,7 +22,6 @@ use visit; use std::cell::Cell; use std::cmp; use std::u32; -use std::vec::Vec; pub fn path_name_i(idents: &[Ident]) -> ~str { // FIXME: Bad copies (#2543 -- same for everything else that says "bad") @@ -711,7 +710,6 @@ mod test { use ast::*; use super::*; use opt_vec; - use std::vec::Vec; fn ident_to_segment(id : &Ident) -> PathSegment { PathSegment {identifier:id.clone(), diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs index 8c6079b4d1a..ff9f9dece95 100644 --- a/src/libsyntax/attr.rs +++ b/src/libsyntax/attr.rs @@ -21,7 +21,6 @@ use parse::token; use crateid::CrateId; use collections::HashSet; -use std::vec::Vec; pub trait AttrMetaMethods { // This could be changed to `fn check_name(&self, name: InternedString) -> diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs index a52fbbe0c50..fca1e25648b 100644 --- a/src/libsyntax/codemap.rs +++ b/src/libsyntax/codemap.rs @@ -24,7 +24,6 @@ source code snippets, etc. use std::cell::RefCell; use std::cmp; use std::rc::Rc; -use std::vec::Vec; use serialize::{Encodable, Decodable, Encoder, Decoder}; pub trait Pos { diff --git a/src/libsyntax/crateid.rs b/src/libsyntax/crateid.rs index 20463612886..96664fc39f6 100644 --- a/src/libsyntax/crateid.rs +++ b/src/libsyntax/crateid.rs @@ -19,7 +19,6 @@ use std::fmt; /// to be `0.0`. use std::from_str::FromStr; -use std::vec::Vec; #[deriving(Clone, Eq)] pub struct CrateId { diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs index b8a4b6d34f4..9371f817ac8 100644 --- a/src/libsyntax/ext/asm.rs +++ b/src/libsyntax/ext/asm.rs @@ -20,8 +20,6 @@ use parse; use parse::token::InternedString; use parse::token; -use std::vec::Vec; - enum State { Asm, Outputs, diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index e456b62e5e7..ccf98f031a1 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -20,7 +20,6 @@ use parse::token::{InternedString, intern, str_to_ident}; use util::small_vector::SmallVector; use collections::HashMap; -use std::vec::Vec; // new-style macro! tt code: // diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index 7cf27e81ca0..e860866ebf9 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -21,8 +21,6 @@ use opt_vec::OptVec; use parse::token::special_idents; use parse::token; -use std::vec::Vec; - pub struct Field { ident: ast::Ident, ex: @ast::Expr diff --git a/src/libsyntax/ext/bytes.rs b/src/libsyntax/ext/bytes.rs index 174f36146aa..ba6ad4888e2 100644 --- a/src/libsyntax/ext/bytes.rs +++ b/src/libsyntax/ext/bytes.rs @@ -17,7 +17,6 @@ use ext::base; use ext::build::AstBuilder; use std::char; -use std::vec::Vec; pub fn expand_syntax_ext(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) -> base::MacResult { // Gather all argument expressions diff --git a/src/libsyntax/ext/cfg.rs b/src/libsyntax/ext/cfg.rs index e885119118c..d83a386554e 100644 --- a/src/libsyntax/ext/cfg.rs +++ b/src/libsyntax/ext/cfg.rs @@ -26,8 +26,6 @@ use parse::token::InternedString; use parse::token; use parse; -use std::vec::Vec; - pub fn expand_cfg(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) -> base::MacResult { let mut p = parse::new_parser_from_tts(cx.parse_sess(), cx.cfg(), diff --git a/src/libsyntax/ext/concat_idents.rs b/src/libsyntax/ext/concat_idents.rs index 2aeda30695e..45a20afab7d 100644 --- a/src/libsyntax/ext/concat_idents.rs +++ b/src/libsyntax/ext/concat_idents.rs @@ -15,7 +15,6 @@ use ext::base; use opt_vec; use parse::token; use parse::token::{str_to_ident}; -use std::vec::Vec; pub fn expand_syntax_ext(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) -> base::MacResult { diff --git a/src/libsyntax/ext/deriving/clone.rs b/src/libsyntax/ext/deriving/clone.rs index a0aa1bb3710..3cbccae664b 100644 --- a/src/libsyntax/ext/deriving/clone.rs +++ b/src/libsyntax/ext/deriving/clone.rs @@ -14,8 +14,6 @@ use ext::base::ExtCtxt; use ext::build::AstBuilder; use ext::deriving::generic::*; -use std::vec::Vec; - pub fn expand_deriving_clone(cx: &mut ExtCtxt, span: Span, mitem: @MetaItem, diff --git a/src/libsyntax/ext/deriving/cmp/eq.rs b/src/libsyntax/ext/deriving/cmp/eq.rs index 80e56f0e407..975b8885de7 100644 --- a/src/libsyntax/ext/deriving/cmp/eq.rs +++ b/src/libsyntax/ext/deriving/cmp/eq.rs @@ -14,8 +14,6 @@ use ext::base::ExtCtxt; use ext::build::AstBuilder; use ext::deriving::generic::*; -use std::vec::Vec; - pub fn expand_deriving_eq(cx: &mut ExtCtxt, span: Span, mitem: @MetaItem, diff --git a/src/libsyntax/ext/deriving/cmp/ord.rs b/src/libsyntax/ext/deriving/cmp/ord.rs index caad6772b19..5605c0b6107 100644 --- a/src/libsyntax/ext/deriving/cmp/ord.rs +++ b/src/libsyntax/ext/deriving/cmp/ord.rs @@ -15,8 +15,6 @@ use ext::base::ExtCtxt; use ext::build::AstBuilder; use ext::deriving::generic::*; -use std::vec::Vec; - pub fn expand_deriving_ord(cx: &mut ExtCtxt, span: Span, mitem: @MetaItem, diff --git a/src/libsyntax/ext/deriving/cmp/totaleq.rs b/src/libsyntax/ext/deriving/cmp/totaleq.rs index 3292246bf0b..ffabed95db5 100644 --- a/src/libsyntax/ext/deriving/cmp/totaleq.rs +++ b/src/libsyntax/ext/deriving/cmp/totaleq.rs @@ -14,8 +14,6 @@ use ext::base::ExtCtxt; use ext::build::AstBuilder; use ext::deriving::generic::*; -use std::vec::Vec; - pub fn expand_deriving_totaleq(cx: &mut ExtCtxt, span: Span, mitem: @MetaItem, diff --git a/src/libsyntax/ext/deriving/cmp/totalord.rs b/src/libsyntax/ext/deriving/cmp/totalord.rs index d8c2eea9896..a584f8abe05 100644 --- a/src/libsyntax/ext/deriving/cmp/totalord.rs +++ b/src/libsyntax/ext/deriving/cmp/totalord.rs @@ -16,7 +16,6 @@ use ext::build::AstBuilder; use ext::deriving::generic::*; use std::cmp::{Ordering, Equal, Less, Greater}; -use std::vec::Vec; pub fn expand_deriving_totalord(cx: &mut ExtCtxt, span: Span, diff --git a/src/libsyntax/ext/deriving/decodable.rs b/src/libsyntax/ext/deriving/decodable.rs index e5e11ce878c..4c9a58c46f7 100644 --- a/src/libsyntax/ext/deriving/decodable.rs +++ b/src/libsyntax/ext/deriving/decodable.rs @@ -21,8 +21,6 @@ use ext::deriving::generic::*; use parse::token::InternedString; use parse::token; -use std::vec::Vec; - pub fn expand_deriving_decodable(cx: &mut ExtCtxt, span: Span, mitem: @MetaItem, diff --git a/src/libsyntax/ext/deriving/default.rs b/src/libsyntax/ext/deriving/default.rs index 2015aa99717..46e9dfb89ab 100644 --- a/src/libsyntax/ext/deriving/default.rs +++ b/src/libsyntax/ext/deriving/default.rs @@ -14,8 +14,6 @@ use ext::base::ExtCtxt; use ext::build::AstBuilder; use ext::deriving::generic::*; -use std::vec::Vec; - pub fn expand_deriving_default(cx: &mut ExtCtxt, span: Span, mitem: @MetaItem, diff --git a/src/libsyntax/ext/deriving/encodable.rs b/src/libsyntax/ext/deriving/encodable.rs index 0550e64bef8..2fa6ec6888b 100644 --- a/src/libsyntax/ext/deriving/encodable.rs +++ b/src/libsyntax/ext/deriving/encodable.rs @@ -89,8 +89,6 @@ use ext::build::AstBuilder; use ext::deriving::generic::*; use parse::token; -use std::vec::Vec; - pub fn expand_deriving_encodable(cx: &mut ExtCtxt, span: Span, mitem: @MetaItem, diff --git a/src/libsyntax/ext/deriving/generic.rs b/src/libsyntax/ext/deriving/generic.rs index dce777aaaae..546c3eac41c 100644 --- a/src/libsyntax/ext/deriving/generic.rs +++ b/src/libsyntax/ext/deriving/generic.rs @@ -187,7 +187,6 @@ use codemap::Span; use opt_vec; use parse::token::InternedString; -use std::vec::Vec; use std::vec; pub use self::ty::*; diff --git a/src/libsyntax/ext/deriving/hash.rs b/src/libsyntax/ext/deriving/hash.rs index 366647cc371..23331dc03cb 100644 --- a/src/libsyntax/ext/deriving/hash.rs +++ b/src/libsyntax/ext/deriving/hash.rs @@ -14,8 +14,6 @@ use ext::base::ExtCtxt; use ext::build::AstBuilder; use ext::deriving::generic::*; -use std::vec::Vec; - pub fn expand_deriving_hash(cx: &mut ExtCtxt, span: Span, mitem: @MetaItem, diff --git a/src/libsyntax/ext/deriving/primitive.rs b/src/libsyntax/ext/deriving/primitive.rs index 35c1437a176..267a12fdff9 100644 --- a/src/libsyntax/ext/deriving/primitive.rs +++ b/src/libsyntax/ext/deriving/primitive.rs @@ -16,8 +16,6 @@ use ext::build::AstBuilder; use ext::deriving::generic::*; use parse::token::InternedString; -use std::vec::Vec; - pub fn expand_deriving_from_primitive(cx: &mut ExtCtxt, span: Span, mitem: @MetaItem, diff --git a/src/libsyntax/ext/deriving/rand.rs b/src/libsyntax/ext/deriving/rand.rs index 4ae140406c3..a31759065ae 100644 --- a/src/libsyntax/ext/deriving/rand.rs +++ b/src/libsyntax/ext/deriving/rand.rs @@ -15,8 +15,6 @@ use ext::base::ExtCtxt; use ext::build::{AstBuilder}; use ext::deriving::generic::*; -use std::vec::Vec; - pub fn expand_deriving_rand(cx: &mut ExtCtxt, span: Span, mitem: @MetaItem, diff --git a/src/libsyntax/ext/deriving/show.rs b/src/libsyntax/ext/deriving/show.rs index d86fff5a4aa..1c80fb9ced2 100644 --- a/src/libsyntax/ext/deriving/show.rs +++ b/src/libsyntax/ext/deriving/show.rs @@ -19,7 +19,6 @@ use ext::deriving::generic::*; use parse::token; use collections::HashMap; -use std::vec::Vec; pub fn expand_deriving_show(cx: &mut ExtCtxt, span: Span, diff --git a/src/libsyntax/ext/deriving/ty.rs b/src/libsyntax/ext/deriving/ty.rs index 22d91956552..5b29af185a4 100644 --- a/src/libsyntax/ext/deriving/ty.rs +++ b/src/libsyntax/ext/deriving/ty.rs @@ -20,8 +20,6 @@ use ext::build::AstBuilder; use codemap::{Span,respan}; use opt_vec; -use std::vec::Vec; - /// The types of pointers pub enum PtrTy<'a> { Send, // ~ diff --git a/src/libsyntax/ext/deriving/zero.rs b/src/libsyntax/ext/deriving/zero.rs index d788bafc9b2..9feae186894 100644 --- a/src/libsyntax/ext/deriving/zero.rs +++ b/src/libsyntax/ext/deriving/zero.rs @@ -14,8 +14,6 @@ use ext::base::ExtCtxt; use ext::build::AstBuilder; use ext::deriving::generic::*; -use std::vec::Vec; - pub fn expand_deriving_zero(cx: &mut ExtCtxt, span: Span, mitem: @MetaItem, diff --git a/src/libsyntax/ext/env.rs b/src/libsyntax/ext/env.rs index bb9e5afaed4..ecf63c8257d 100644 --- a/src/libsyntax/ext/env.rs +++ b/src/libsyntax/ext/env.rs @@ -22,7 +22,6 @@ use ext::build::AstBuilder; use parse::token; use std::os; -use std::vec::Vec; pub fn expand_option_env(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) -> base::MacResult { diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 4134b23125e..395bae822a1 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -32,7 +32,6 @@ use util::small_vector::SmallVector; use std::cast; use std::unstable::dynamic_lib::DynamicLibrary; use std::os; -use std::vec::Vec; pub fn expand_expr(e: @ast::Expr, fld: &mut MacroExpander) -> @ast::Expr { match e.node { @@ -979,8 +978,6 @@ mod test { use visit; use visit::Visitor; - use std::vec::Vec; - // a visitor that extracts the paths // from a given thingy and puts them in a mutable // array (passed in to the traversal) diff --git a/src/libsyntax/ext/format.rs b/src/libsyntax/ext/format.rs index 743fe798480..0f11dc51a99 100644 --- a/src/libsyntax/ext/format.rs +++ b/src/libsyntax/ext/format.rs @@ -21,7 +21,6 @@ use rsparse = parse; use std::fmt::parse; use collections::{HashMap, HashSet}; use std::slice; -use std::vec::Vec; #[deriving(Eq)] enum ArgumentType { diff --git a/src/libsyntax/ext/mtwt.rs b/src/libsyntax/ext/mtwt.rs index ab5f3fbf3a6..597e3584385 100644 --- a/src/libsyntax/ext/mtwt.rs +++ b/src/libsyntax/ext/mtwt.rs @@ -20,7 +20,6 @@ use ast::{Ident, Mrk, Name, SyntaxContext}; use std::cell::RefCell; use std::local_data; use std::rc::Rc; -use std::vec::Vec; use collections::HashMap; @@ -281,7 +280,6 @@ mod tests { use super::{resolve, xorPush, new_mark_internal, new_sctable_internal}; use super::{new_rename_internal, marksof_internal, resolve_internal}; use super::{SCTable, EmptyCtxt, Mark, Rename, IllegalCtxt}; - use std::vec::Vec; use collections::HashMap; #[test] fn xorpush_test () { diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index 5b66184b16c..14847aee8cf 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -17,8 +17,6 @@ use parse::token::*; use parse::token; use parse; -use std::vec::Vec; - /** * * Quasiquoting works via token trees. @@ -37,8 +35,6 @@ pub mod rt { use parse; use print::pprust; - use std::vec::Vec; - pub use ast::*; pub use parse::token::*; pub use parse::new_parser_from_tts; diff --git a/src/libsyntax/ext/registrar.rs b/src/libsyntax/ext/registrar.rs index db59388e24f..ecd60fc9932 100644 --- a/src/libsyntax/ext/registrar.rs +++ b/src/libsyntax/ext/registrar.rs @@ -15,8 +15,6 @@ use diagnostic; use visit; use visit::Visitor; -use std::vec::Vec; - struct MacroRegistrarContext { registrars: Vec<(ast::NodeId, Span)> , } diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index f5c29840e48..aa4f192f779 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -22,7 +22,6 @@ use parse::token::{Token, EOF, Nonterminal}; use parse::token; use collections::HashMap; -use std::vec::Vec; /* This is an Earley-like parser, without support for in-grammar nonterminals, only by calling out to the main rust parser for named nonterminals (which it diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index d283d6d7142..b2f4904ec8f 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -28,7 +28,6 @@ use print; use util::small_vector::SmallVector; use std::cell::RefCell; -use std::vec::Vec; struct ParserAnyMacro<'a> { parser: RefCell<Parser<'a>>, diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs index 19af4eed4c3..e9db0bd0bd2 100644 --- a/src/libsyntax/ext/tt/transcribe.rs +++ b/src/libsyntax/ext/tt/transcribe.rs @@ -18,7 +18,6 @@ use parse::token; use parse::lexer::TokenAndSpan; use std::cell::{Cell, RefCell}; -use std::vec::Vec; use collections::HashMap; ///an unzipping of `TokenTree`s diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index a54c3b6af01..e1a41471de4 100644 --- a/src/libsyntax/fold.rs +++ b/src/libsyntax/fold.rs @@ -16,8 +16,6 @@ use parse::token; use opt_vec::OptVec; use util::small_vector::SmallVector; -use std::vec::Vec; - // We may eventually want to be able to fold over type parameters, too. pub trait Folder { fn fold_crate(&mut self, c: Crate) -> Crate { diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index 08b4fa7b444..73ff9e147e8 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -30,7 +30,6 @@ This API is completely unstable and subject to change. #[allow(deprecated)]; #[deny(non_camel_case_types)]; -#[allow(deprecated_owned_vector)]; extern crate serialize; extern crate term; diff --git a/src/libsyntax/opt_vec.rs b/src/libsyntax/opt_vec.rs index 55261fd3267..aeb521468d2 100644 --- a/src/libsyntax/opt_vec.rs +++ b/src/libsyntax/opt_vec.rs @@ -17,7 +17,6 @@ use std::default::Default; use std::slice; -use std::vec::Vec; #[deriving(Clone, Encodable, Decodable, Hash)] pub enum OptVec<T> { diff --git a/src/libsyntax/parse/attr.rs b/src/libsyntax/parse/attr.rs index e86f6f5be81..c30ab4bda27 100644 --- a/src/libsyntax/parse/attr.rs +++ b/src/libsyntax/parse/attr.rs @@ -15,8 +15,6 @@ use parse::token; use parse::parser::Parser; use parse::token::INTERPOLATED; -use std::vec::Vec; - // a parser that can parse attributes. pub trait ParserAttr { fn parse_outer_attributes(&mut self) -> Vec<ast::Attribute> ; diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs index 9bc0fdd3078..8abc01b6d75 100644 --- a/src/libsyntax/parse/comments.rs +++ b/src/libsyntax/parse/comments.rs @@ -20,7 +20,6 @@ use parse::token; use std::io; use std::str; use std::uint; -use std::vec::Vec; #[deriving(Clone, Eq)] pub enum CommentStyle { diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs index c34ef465dad..58ec6acc3ac 100644 --- a/src/libsyntax/parse/lexer.rs +++ b/src/libsyntax/parse/lexer.rs @@ -1005,7 +1005,6 @@ mod test { use parse::token; use parse::token::{str_to_ident}; use std::io::util; - use std::vec::Vec; fn mk_sh() -> diagnostic::SpanHandler { let emitter = diagnostic::EmitterWriter::new(~util::NullWriter); diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index 7e8ca77eb04..286b44e5c80 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -21,7 +21,6 @@ use std::cell::RefCell; use std::io::File; use std::rc::Rc; use std::str; -use std::vec::Vec; pub mod lexer; pub mod parser; @@ -279,7 +278,6 @@ mod test { use std::io; use std::io::MemWriter; use std::str; - use std::vec::Vec; use codemap::{Span, BytePos, Spanned}; use opt_vec; use ast; diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 0ded6abe146..5398844d52a 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -82,7 +82,6 @@ use std::cell::Cell; use collections::HashSet; use std::kinds::marker; use std::mem::replace; -use std::vec::Vec; use std::vec; #[allow(non_camel_case_types)] diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 43d686dc6cb..eebb98294d5 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -22,7 +22,6 @@ use std::char; use std::fmt; use std::local_data; use std::path::BytesContainer; -use std::vec::Vec; #[allow(non_camel_case_types)] #[deriving(Clone, Encodable, Decodable, Eq, Hash, Show)] diff --git a/src/libsyntax/print/pp.rs b/src/libsyntax/print/pp.rs index c588e407e30..4996c1e96a8 100644 --- a/src/libsyntax/print/pp.rs +++ b/src/libsyntax/print/pp.rs @@ -62,7 +62,6 @@ */ use std::io; -use std::vec::Vec; #[deriving(Clone, Eq)] pub enum Breaks { diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 5c23dd163d1..1b8f48861aa 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -32,7 +32,6 @@ use std::char; use std::str; use std::io; use std::io::{IoResult, MemWriter}; -use std::vec::Vec; // The &mut State is stored here to prevent recursive type. pub enum AnnNode<'a> { @@ -2392,8 +2391,6 @@ mod test { use codemap; use parse::token; - use std::vec::Vec; - #[test] fn test_fun_to_str() { let abba_ident = token::str_to_ident("abba"); diff --git a/src/libsyntax/util/interner.rs b/src/libsyntax/util/interner.rs index 0406f5f5ba9..2dea6f79ee6 100644 --- a/src/libsyntax/util/interner.rs +++ b/src/libsyntax/util/interner.rs @@ -21,7 +21,6 @@ use std::cmp::Equiv; use std::fmt; use std::hash::Hash; use std::rc::Rc; -use std::vec::Vec; pub struct Interner<T> { priv map: RefCell<HashMap<T, Name>>, diff --git a/src/libsyntax/util/parser_testing.rs b/src/libsyntax/util/parser_testing.rs index 13590542dac..b62990036e5 100644 --- a/src/libsyntax/util/parser_testing.rs +++ b/src/libsyntax/util/parser_testing.rs @@ -15,8 +15,6 @@ use parse::{new_parser_from_source_str}; use parse::parser::Parser; use parse::token; -use std::vec::Vec; - // map a string to tts, using a made-up filename: pub fn string_to_tts(source_str: ~str) -> Vec<ast::TokenTree> { let ps = new_parse_sess(); diff --git a/src/libsyntax/util/small_vector.rs b/src/libsyntax/util/small_vector.rs index 72faaee64ff..ac2b00bed76 100644 --- a/src/libsyntax/util/small_vector.rs +++ b/src/libsyntax/util/small_vector.rs @@ -9,7 +9,6 @@ // except according to those terms. use std::mem; -use std::vec::Vec; use std::vec; /// A vector type optimized for cases where the size is almost always 0 or 1 @@ -146,8 +145,6 @@ impl<T> Iterator<T> for MoveItems<T> { mod test { use super::*; - use std::vec::Vec; - #[test] fn test_len() { let v: SmallVector<int> = SmallVector::zero(); diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs index 408c9d635b6..482bac77777 100644 --- a/src/libsyntax/visit.rs +++ b/src/libsyntax/visit.rs @@ -15,7 +15,6 @@ use codemap::Span; use parse; use opt_vec; use opt_vec::OptVec; -use std::vec::Vec; // Context-passing AST walker. Each overridden visit method has full control // over what happens with its node, it can do its own traversal of the node's diff --git a/src/libterm/lib.rs b/src/libterm/lib.rs index 089c1668bf3..411b0558573 100644 --- a/src/libterm/lib.rs +++ b/src/libterm/lib.rs @@ -22,7 +22,6 @@ #[feature(macro_rules)]; #[deny(non_camel_case_types)]; #[allow(missing_doc)]; -#[allow(deprecated_owned_vector)]; extern crate collections; diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index efd1fbcd1ac..3ec80d97d06 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -33,7 +33,6 @@ html_root_url = "http://static.rust-lang.org/doc/master")]; #[feature(asm, macro_rules)]; -#[allow(deprecated_owned_vector)]; extern crate collections; extern crate getopts; diff --git a/src/libtime/lib.rs b/src/libtime/lib.rs index 37c45c21001..183d86059ac 100644 --- a/src/libtime/lib.rs +++ b/src/libtime/lib.rs @@ -17,7 +17,6 @@ html_root_url = "http://static.rust-lang.org/doc/master")]; #[feature(phase)]; -#[allow(deprecated_owned_vector)]; #[cfg(test)] #[phase(syntax, link)] extern crate log; extern crate serialize; diff --git a/src/liburl/lib.rs b/src/liburl/lib.rs index 9a24e8ecfa9..55d87000130 100644 --- a/src/liburl/lib.rs +++ b/src/liburl/lib.rs @@ -18,7 +18,6 @@ html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://static.rust-lang.org/doc/master")]; #[feature(default_type_params)]; -#[allow(deprecated_owned_vector)]; extern crate collections; @@ -28,7 +27,6 @@ use std::hash::Hash; use std::io::BufReader; use std::from_str::FromStr; use std::uint; -use std::vec::Vec; use collections::HashMap; diff --git a/src/libuuid/lib.rs b/src/libuuid/lib.rs index 7aed4cd3d9b..d4a33d6782d 100644 --- a/src/libuuid/lib.rs +++ b/src/libuuid/lib.rs @@ -62,8 +62,6 @@ Examples of string representations: html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://static.rust-lang.org/doc/master")]; -#[allow(deprecated_owned_vector)]; - #[feature(default_type_params)]; // NOTE remove the following two attributes after the next snapshot. diff --git a/src/libworkcache/lib.rs b/src/libworkcache/lib.rs index 219bb38b3c8..79ed15655cc 100644 --- a/src/libworkcache/lib.rs +++ b/src/libworkcache/lib.rs @@ -16,7 +16,7 @@ html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://static.rust-lang.org/doc/master")]; #[feature(phase)]; -#[allow(deprecated_owned_vector, visible_private_types)]; +#[allow(visible_private_types)]; #[phase(syntax, link)] extern crate log; extern crate serialize; diff --git a/src/test/compile-fail/issue-11873.rs b/src/test/compile-fail/issue-11873.rs index 1ae887a8332..0ca326c1e0d 100644 --- a/src/test/compile-fail/issue-11873.rs +++ b/src/test/compile-fail/issue-11873.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::vec::Vec; - fn main() { let mut v = vec!(1); let f = || v.push(2); diff --git a/src/test/run-pass/overloaded-autoderef-count.rs b/src/test/run-pass/overloaded-autoderef-count.rs index 1243ba1ce16..00877e7c2c9 100644 --- a/src/test/run-pass/overloaded-autoderef-count.rs +++ b/src/test/run-pass/overloaded-autoderef-count.rs @@ -10,7 +10,6 @@ use std::cell::Cell; use std::ops::{Deref, DerefMut}; -use std::vec::Vec; #[deriving(Eq)] struct DerefCounter<T> { diff --git a/src/test/run-pass/typeck_type_placeholder_1.rs b/src/test/run-pass/typeck_type_placeholder_1.rs index e75bcb8b89e..0316311993a 100644 --- a/src/test/run-pass/typeck_type_placeholder_1.rs +++ b/src/test/run-pass/typeck_type_placeholder_1.rs @@ -14,8 +14,6 @@ static CONSTEXPR: *int = &'static 413 as *_; pub fn main() { - use std::vec::Vec; - let x: Vec<_> = range(0u, 5).collect(); assert_eq!(x.as_slice(), &[0u,1,2,3,4]); |