parent
7aded2adb6
commit
14f656d1a7
|
@ -1575,7 +1575,7 @@ mod test_map {
|
||||||
use super::HashMap;
|
use super::HashMap;
|
||||||
use std::iter::{Iterator,range_inclusive,range_step_inclusive};
|
use std::iter::{Iterator,range_inclusive,range_step_inclusive};
|
||||||
use std::local_data;
|
use std::local_data;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_create_capacity_zero() {
|
fn test_create_capacity_zero() {
|
||||||
|
@ -1599,7 +1599,7 @@ mod test_map {
|
||||||
assert_eq!(*m.find(&2).unwrap(), 4);
|
assert_eq!(*m.find(&2).unwrap(), 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
local_data_key!(drop_vector: vec_ng::Vec<int>)
|
local_data_key!(drop_vector: vec::Vec<int>)
|
||||||
|
|
||||||
#[deriving(Hash, Eq)]
|
#[deriving(Hash, Eq)]
|
||||||
struct Dropable {
|
struct Dropable {
|
||||||
|
@ -1625,7 +1625,7 @@ mod test_map {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_drops() {
|
fn test_drops() {
|
||||||
local_data::set(drop_vector, vec_ng::Vec::from_elem(200, 0));
|
local_data::set(drop_vector, vec::Vec::from_elem(200, 0));
|
||||||
|
|
||||||
{
|
{
|
||||||
let mut m = HashMap::new();
|
let mut m = HashMap::new();
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
use std::cmp;
|
use std::cmp;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
#[deriving(Show, Clone)]
|
#[deriving(Show, Clone)]
|
||||||
pub struct LogDirective {
|
pub struct LogDirective {
|
||||||
|
|
|
@ -126,7 +126,7 @@ use std::local_data;
|
||||||
use std::os;
|
use std::os;
|
||||||
use std::rt;
|
use std::rt;
|
||||||
use std::slice;
|
use std::slice;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
use sync::one::{Once, ONCE_INIT};
|
use sync::one::{Once, ONCE_INIT};
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ use std::libc;
|
||||||
use std::mem;
|
use std::mem;
|
||||||
use std::rt::rtio;
|
use std::rt::rtio;
|
||||||
use std::slice;
|
use std::slice;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
use io::{IoResult, retry, keep_going};
|
use io::{IoResult, retry, keep_going};
|
||||||
|
|
||||||
|
|
|
@ -28,8 +28,8 @@ use rand::Rng;
|
||||||
use std::str;
|
use std::str;
|
||||||
use std::uint;
|
use std::uint;
|
||||||
use std::{i64, u64};
|
use std::{i64, u64};
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
A `BigDigit` is a `BigUint`'s composing element.
|
A `BigDigit` is a `BigUint`'s composing element.
|
||||||
|
@ -753,7 +753,7 @@ impl BigUint {
|
||||||
fn shl_unit(&self, n_unit: uint) -> BigUint {
|
fn shl_unit(&self, n_unit: uint) -> BigUint {
|
||||||
if n_unit == 0 || self.is_zero() { return (*self).clone(); }
|
if n_unit == 0 || self.is_zero() { return (*self).clone(); }
|
||||||
|
|
||||||
return BigUint::new(vec_ng::append(Vec::from_elem(n_unit, ZERO_BIG_DIGIT),
|
return BigUint::new(vec::append(Vec::from_elem(n_unit, ZERO_BIG_DIGIT),
|
||||||
self.data.as_slice()));
|
self.data.as_slice()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1461,7 +1461,7 @@ mod biguint_tests {
|
||||||
use std::num::CheckedDiv;
|
use std::num::CheckedDiv;
|
||||||
use rand::{task_rng};
|
use rand::{task_rng};
|
||||||
use std::u64;
|
use std::u64;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_from_slice() {
|
fn test_from_slice() {
|
||||||
|
@ -2195,7 +2195,7 @@ mod bigint_tests {
|
||||||
use std::num::{ToPrimitive, FromPrimitive};
|
use std::num::{ToPrimitive, FromPrimitive};
|
||||||
use rand::{task_rng};
|
use rand::{task_rng};
|
||||||
use std::u64;
|
use std::u64;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_from_biguint() {
|
fn test_from_biguint() {
|
||||||
|
|
|
@ -16,7 +16,7 @@ use std::cmp;
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
use std::from_str::FromStr;
|
use std::from_str::FromStr;
|
||||||
use std::num::{Zero,One,ToStrRadix,FromStrRadix,Round};
|
use std::num::{Zero,One,ToStrRadix,FromStrRadix,Round};
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use bigint::{BigInt, BigUint, Sign, Plus, Minus};
|
use bigint::{BigInt, BigUint, Sign, Plus, Minus};
|
||||||
|
|
||||||
/// Represents the ratio between 2 numbers.
|
/// Represents the ratio between 2 numbers.
|
||||||
|
|
|
@ -16,7 +16,7 @@ use metadata::filesearch;
|
||||||
use lib::llvm::{ArchiveRef, llvm};
|
use lib::llvm::{ArchiveRef, llvm};
|
||||||
|
|
||||||
use std::cast;
|
use std::cast;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::io;
|
use std::io;
|
||||||
use std::io::{fs, TempDir};
|
use std::io::{fs, TempDir};
|
||||||
use std::libc;
|
use std::libc;
|
||||||
|
|
|
@ -33,7 +33,7 @@ use std::ptr;
|
||||||
use std::str;
|
use std::str;
|
||||||
use std::io;
|
use std::io;
|
||||||
use std::io::{fs, TempDir, Process};
|
use std::io::{fs, TempDir, Process};
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use flate;
|
use flate;
|
||||||
use serialize::hex::ToHex;
|
use serialize::hex::ToHex;
|
||||||
use syntax::abi;
|
use syntax::abi;
|
||||||
|
@ -105,7 +105,7 @@ pub mod write {
|
||||||
use std::io::Process;
|
use std::io::Process;
|
||||||
use std::libc::{c_uint, c_int};
|
use std::libc::{c_uint, c_int};
|
||||||
use std::str;
|
use std::str;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
// On android, we by default compile for armv7 processors. This enables
|
// On android, we by default compile for armv7 processors. This enables
|
||||||
// things like double word CAS instructions (rather than emulating them)
|
// things like double word CAS instructions (rather than emulating them)
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
use back::target_strs;
|
use back::target_strs;
|
||||||
use driver::session::sess_os_to_meta_os;
|
use driver::session::sess_os_to_meta_os;
|
||||||
use metadata::loader::meta_section_name;
|
use metadata::loader::meta_section_name;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::abi;
|
use syntax::abi;
|
||||||
|
|
||||||
pub fn get_target_strs(target_triple: ~str, target_os: abi::Os) -> target_strs::t {
|
pub fn get_target_strs(target_triple: ~str, target_os: abi::Os) -> target_strs::t {
|
||||||
|
|
|
@ -15,7 +15,7 @@ use metadata::filesearch;
|
||||||
|
|
||||||
use collections::HashSet;
|
use collections::HashSet;
|
||||||
use std::{os, slice};
|
use std::{os, slice};
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::abi;
|
use syntax::abi;
|
||||||
|
|
||||||
fn not_win32(os: abi::Os) -> bool {
|
fn not_win32(os: abi::Os) -> bool {
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
#[allow(non_camel_case_types)];
|
#[allow(non_camel_case_types)];
|
||||||
|
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
pub struct t {
|
pub struct t {
|
||||||
module_asm: ~str,
|
module_asm: ~str,
|
||||||
|
|
|
@ -37,8 +37,8 @@ use std::io::fs;
|
||||||
use std::io::MemReader;
|
use std::io::MemReader;
|
||||||
use std::mem::drop;
|
use std::mem::drop;
|
||||||
use std::os;
|
use std::os;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
use getopts::{optopt, optmulti, optflag, optflagopt};
|
use getopts::{optopt, optmulti, optflag, optflagopt};
|
||||||
use getopts;
|
use getopts;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
|
@ -138,7 +138,7 @@ pub fn build_configuration(sess: &Session) -> ast::CrateConfig {
|
||||||
} else {
|
} else {
|
||||||
InternedString::new("nogc")
|
InternedString::new("nogc")
|
||||||
});
|
});
|
||||||
return vec_ng::append(user_cfg.move_iter().collect(),
|
return vec::append(user_cfg.move_iter().collect(),
|
||||||
default_cfg.as_slice());
|
default_cfg.as_slice());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -835,7 +835,7 @@ pub fn build_session_options(matches: &getopts::Matches) -> session::Options {
|
||||||
|
|
||||||
let level_short = level_name.slice_chars(0, 1);
|
let level_short = level_name.slice_chars(0, 1);
|
||||||
let level_short = level_short.to_ascii().to_upper().into_str();
|
let level_short = level_short.to_ascii().to_upper().into_str();
|
||||||
let flags = vec_ng::append(matches.opt_strs(level_short)
|
let flags = vec::append(matches.opt_strs(level_short)
|
||||||
.move_iter()
|
.move_iter()
|
||||||
.collect(),
|
.collect(),
|
||||||
matches.opt_strs(level_name));
|
matches.opt_strs(level_name));
|
||||||
|
|
|
@ -28,7 +28,7 @@ use syntax::{abi, ast, codemap};
|
||||||
use syntax;
|
use syntax;
|
||||||
|
|
||||||
use std::cell::{Cell, RefCell};
|
use std::cell::{Cell, RefCell};
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use collections::HashSet;
|
use collections::HashSet;
|
||||||
|
|
||||||
pub struct Config {
|
pub struct Config {
|
||||||
|
@ -407,7 +407,7 @@ macro_rules! cgoptions(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn parse_list(slot: &mut ::std::vec_ng::Vec<~str>, v: Option<&str>)
|
fn parse_list(slot: &mut ::std::vec::Vec<~str>, v: Option<&str>)
|
||||||
-> bool {
|
-> bool {
|
||||||
match v {
|
match v {
|
||||||
Some(s) => {
|
Some(s) => {
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
// option. This file may not be copied, modified, or distributed
|
// option. This file may not be copied, modified, or distributed
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::fold::Folder;
|
use syntax::fold::Folder;
|
||||||
use syntax::{ast, fold, attr};
|
use syntax::{ast, fold, attr};
|
||||||
use syntax::codemap;
|
use syntax::codemap;
|
||||||
|
|
|
@ -31,7 +31,7 @@ use syntax::parse::token;
|
||||||
use driver::session::Session;
|
use driver::session::Session;
|
||||||
|
|
||||||
use std::cell::Cell;
|
use std::cell::Cell;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
/// This is a list of all known features since the beginning of time. This list
|
/// 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
|
/// can never shrink, it may only be expanded (in order to prevent old programs
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
|
|
||||||
use driver::session::Session;
|
use driver::session::Session;
|
||||||
|
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::attr;
|
use syntax::attr;
|
||||||
use syntax::codemap::DUMMY_SP;
|
use syntax::codemap::DUMMY_SP;
|
||||||
|
@ -182,7 +182,7 @@ impl<'a> fold::Folder for PreludeInjector<'a> {
|
||||||
span: DUMMY_SP,
|
span: DUMMY_SP,
|
||||||
};
|
};
|
||||||
|
|
||||||
let vis = vec_ng::append(vec!(vi2), module.view_items.as_slice());
|
let vis = vec::append(vec!(vi2), module.view_items.as_slice());
|
||||||
|
|
||||||
// FIXME #2543: Bad copy.
|
// FIXME #2543: Bad copy.
|
||||||
let new_module = ast::Mod {
|
let new_module = ast::Mod {
|
||||||
|
|
|
@ -20,8 +20,8 @@ use metadata::creader::Loader;
|
||||||
|
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::slice;
|
use std::slice;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
use syntax::ast_util::*;
|
use syntax::ast_util::*;
|
||||||
use syntax::attr::AttrMetaMethods;
|
use syntax::attr::AttrMetaMethods;
|
||||||
use syntax::attr;
|
use syntax::attr;
|
||||||
|
@ -281,7 +281,7 @@ fn should_fail(i: @ast::Item) -> bool {
|
||||||
fn add_test_module(cx: &TestCtxt, m: &ast::Mod) -> ast::Mod {
|
fn add_test_module(cx: &TestCtxt, m: &ast::Mod) -> ast::Mod {
|
||||||
let testmod = mk_test_module(cx);
|
let testmod = mk_test_module(cx);
|
||||||
ast::Mod {
|
ast::Mod {
|
||||||
items: vec_ng::append_one(m.items.clone(), testmod),
|
items: vec::append_one(m.items.clone(), testmod),
|
||||||
..(*m).clone()
|
..(*m).clone()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,8 +55,8 @@ use std::io;
|
||||||
use std::os;
|
use std::os;
|
||||||
use std::str;
|
use std::str;
|
||||||
use std::task;
|
use std::task;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::diagnostic::Emitter;
|
use syntax::diagnostic::Emitter;
|
||||||
use syntax::diagnostic;
|
use syntax::diagnostic;
|
||||||
|
@ -241,7 +241,7 @@ pub fn run_compiler(args: &[~str]) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
let lint_flags = vec_ng::append(matches.opt_strs("W")
|
let lint_flags = vec::append(matches.opt_strs("W")
|
||||||
.move_iter()
|
.move_iter()
|
||||||
.collect(),
|
.collect(),
|
||||||
matches.opt_strs("warn"));
|
matches.opt_strs("warn"));
|
||||||
|
|
|
@ -23,7 +23,7 @@ use metadata::loader;
|
||||||
use metadata::loader::Os;
|
use metadata::loader::Os;
|
||||||
|
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use collections::HashMap;
|
use collections::HashMap;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::abi;
|
use syntax::abi;
|
||||||
|
|
|
@ -20,8 +20,8 @@ use middle::typeck;
|
||||||
|
|
||||||
use reader = serialize::ebml::reader;
|
use reader = serialize::ebml::reader;
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::ast_map;
|
use syntax::ast_map;
|
||||||
use syntax::diagnostic::expect;
|
use syntax::diagnostic::expect;
|
||||||
|
@ -94,7 +94,7 @@ pub fn get_item_path(tcx: &ty::ctxt, def: ast::DefId) -> Vec<ast_map::PathElem>
|
||||||
|
|
||||||
// FIXME #1920: This path is not always correct if the crate is not linked
|
// FIXME #1920: This path is not always correct if the crate is not linked
|
||||||
// into the root namespace.
|
// into the root namespace.
|
||||||
vec_ng::append(vec!(ast_map::PathMod(token::intern(cdata.name))),
|
vec::append(vec!(ast_map::PathMod(token::intern(cdata.name))),
|
||||||
path.as_slice())
|
path.as_slice())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ use metadata::decoder;
|
||||||
use metadata::loader;
|
use metadata::loader;
|
||||||
|
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::c_vec::CVec;
|
use std::c_vec::CVec;
|
||||||
use collections::HashMap;
|
use collections::HashMap;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
|
|
|
@ -33,7 +33,7 @@ use std::io;
|
||||||
use std::io::extensions::u64_from_be_bytes;
|
use std::io::extensions::u64_from_be_bytes;
|
||||||
use std::option;
|
use std::option;
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use serialize::ebml::reader;
|
use serialize::ebml::reader;
|
||||||
use serialize::ebml;
|
use serialize::ebml;
|
||||||
use serialize::Decodable;
|
use serialize::Decodable;
|
||||||
|
|
|
@ -32,7 +32,7 @@ use std::hash;
|
||||||
use std::hash::Hash;
|
use std::hash::Hash;
|
||||||
use std::io::MemWriter;
|
use std::io::MemWriter;
|
||||||
use std::str;
|
use std::str;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use collections::HashMap;
|
use collections::HashMap;
|
||||||
use syntax::abi::AbiSet;
|
use syntax::abi::AbiSet;
|
||||||
use syntax::ast::*;
|
use syntax::ast::*;
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::os;
|
use std::os;
|
||||||
use std::io::fs;
|
use std::io::fs;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use collections::HashSet;
|
use collections::HashSet;
|
||||||
|
|
||||||
pub enum FileMatch { FileMatches, FileDoesntMatch }
|
pub enum FileMatch { FileMatches, FileDoesntMatch }
|
||||||
|
|
|
@ -31,7 +31,7 @@ use std::io;
|
||||||
use std::os::consts::{macos, freebsd, linux, android, win32};
|
use std::os::consts::{macos, freebsd, linux, android, win32};
|
||||||
use std::str;
|
use std::str;
|
||||||
use std::slice;
|
use std::slice;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
use collections::{HashMap, HashSet};
|
use collections::{HashMap, HashSet};
|
||||||
use flate;
|
use flate;
|
||||||
|
|
|
@ -20,7 +20,7 @@ use middle::ty;
|
||||||
|
|
||||||
use std::str;
|
use std::str;
|
||||||
use std::uint;
|
use std::uint;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::abi::AbiSet;
|
use syntax::abi::AbiSet;
|
||||||
use syntax::abi;
|
use syntax::abi;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
|
|
|
@ -19,7 +19,7 @@ use std::io;
|
||||||
use std::io::MemWriter;
|
use std::io::MemWriter;
|
||||||
use std::str;
|
use std::str;
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
use middle::ty::param_ty;
|
use middle::ty::param_ty;
|
||||||
use middle::ty;
|
use middle::ty;
|
||||||
|
|
|
@ -37,7 +37,7 @@ use std::cast;
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::io::Seek;
|
use std::io::Seek;
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
use serialize::ebml::reader;
|
use serialize::ebml::reader;
|
||||||
use serialize::ebml;
|
use serialize::ebml;
|
||||||
|
|
|
@ -23,7 +23,7 @@ use middle::borrowck::*;
|
||||||
use middle::moves;
|
use middle::moves;
|
||||||
use middle::ty;
|
use middle::ty;
|
||||||
use middle::typeck::MethodCall;
|
use middle::typeck::MethodCall;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::ast_util;
|
use syntax::ast_util;
|
||||||
use syntax::codemap::Span;
|
use syntax::codemap::Span;
|
||||||
|
|
|
@ -27,7 +27,7 @@ use middle::typeck::MethodCall;
|
||||||
use util::common::indenter;
|
use util::common::indenter;
|
||||||
use util::ppaux::{Repr};
|
use util::ppaux::{Repr};
|
||||||
|
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::ast_util;
|
use syntax::ast_util;
|
||||||
use syntax::ast_util::IdRange;
|
use syntax::ast_util::IdRange;
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
* Computes the restrictions that result from a borrow.
|
* Computes the restrictions that result from a borrow.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
use middle::borrowck::*;
|
use middle::borrowck::*;
|
||||||
use mc = middle::mem_categorization;
|
use mc = middle::mem_categorization;
|
||||||
use middle::ty;
|
use middle::ty;
|
||||||
|
@ -174,7 +174,7 @@ impl<'a> RestrictionsContext<'a> {
|
||||||
Safe => Safe,
|
Safe => Safe,
|
||||||
SafeIf(base_lp, base_vec) => {
|
SafeIf(base_lp, base_vec) => {
|
||||||
let lp = @LpExtend(base_lp, mc, elem);
|
let lp = @LpExtend(base_lp, mc, elem);
|
||||||
SafeIf(lp, vec_ng::append_one(base_vec,
|
SafeIf(lp, vec::append_one(base_vec,
|
||||||
Restriction {
|
Restriction {
|
||||||
loan_path: lp,
|
loan_path: lp,
|
||||||
set: restrictions
|
set: restrictions
|
||||||
|
|
|
@ -25,7 +25,7 @@ use std::cell::{Cell, RefCell};
|
||||||
use collections::HashMap;
|
use collections::HashMap;
|
||||||
use std::ops::{BitOr, BitAnd};
|
use std::ops::{BitOr, BitAnd};
|
||||||
use std::result::{Result};
|
use std::result::{Result};
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::ast_map;
|
use syntax::ast_map;
|
||||||
use syntax::ast_util;
|
use syntax::ast_util;
|
||||||
|
|
|
@ -17,7 +17,7 @@ comments in the section "Moves and initialization" and in `doc.rs`.
|
||||||
|
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::uint;
|
use std::uint;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use collections::{HashMap, HashSet};
|
use collections::{HashMap, HashSet};
|
||||||
use middle::borrowck::*;
|
use middle::borrowck::*;
|
||||||
use middle::dataflow::DataFlowContext;
|
use middle::dataflow::DataFlowContext;
|
||||||
|
|
|
@ -12,7 +12,7 @@ use middle::cfg::*;
|
||||||
use middle::graph;
|
use middle::graph;
|
||||||
use middle::typeck;
|
use middle::typeck;
|
||||||
use middle::ty;
|
use middle::ty;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::ast_util;
|
use syntax::ast_util;
|
||||||
use syntax::opt_vec;
|
use syntax::opt_vec;
|
||||||
|
|
|
@ -15,7 +15,7 @@ use middle::ty;
|
||||||
use middle::typeck;
|
use middle::typeck;
|
||||||
use util::ppaux;
|
use util::ppaux;
|
||||||
|
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast::*;
|
use syntax::ast::*;
|
||||||
use syntax::{ast_util, ast_map};
|
use syntax::{ast_util, ast_map};
|
||||||
use syntax::visit::Visitor;
|
use syntax::visit::Visitor;
|
||||||
|
|
|
@ -21,8 +21,8 @@ use util::ppaux::ty_to_str;
|
||||||
|
|
||||||
use std::cmp;
|
use std::cmp;
|
||||||
use std::iter;
|
use std::iter;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
use syntax::ast::*;
|
use syntax::ast::*;
|
||||||
use syntax::ast_util::{unguarded_pat, walk_pat};
|
use syntax::ast_util::{unguarded_pat, walk_pat};
|
||||||
use syntax::codemap::{DUMMY_SP, Span};
|
use syntax::codemap::{DUMMY_SP, Span};
|
||||||
|
@ -569,10 +569,10 @@ fn specialize(cx: &MatchCheckCtxt,
|
||||||
Pat{id: pat_id, node: n, span: pat_span} =>
|
Pat{id: pat_id, node: n, span: pat_span} =>
|
||||||
match n {
|
match n {
|
||||||
PatWild => {
|
PatWild => {
|
||||||
Some(vec_ng::append(Vec::from_elem(arity, wild()), r.tail()))
|
Some(vec::append(Vec::from_elem(arity, wild()), r.tail()))
|
||||||
}
|
}
|
||||||
PatWildMulti => {
|
PatWildMulti => {
|
||||||
Some(vec_ng::append(Vec::from_elem(arity, wild_multi()),
|
Some(vec::append(Vec::from_elem(arity, wild_multi()),
|
||||||
r.tail()))
|
r.tail()))
|
||||||
}
|
}
|
||||||
PatIdent(_, _, _) => {
|
PatIdent(_, _, _) => {
|
||||||
|
@ -628,7 +628,7 @@ fn specialize(cx: &MatchCheckCtxt,
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
Some(
|
Some(
|
||||||
vec_ng::append(
|
vec::append(
|
||||||
Vec::from_elem(arity, wild()),
|
Vec::from_elem(arity, wild()),
|
||||||
r.tail()
|
r.tail()
|
||||||
)
|
)
|
||||||
|
@ -682,7 +682,7 @@ fn specialize(cx: &MatchCheckCtxt,
|
||||||
Some(args) => args.iter().map(|x| *x).collect(),
|
Some(args) => args.iter().map(|x| *x).collect(),
|
||||||
None => Vec::from_elem(arity, wild())
|
None => Vec::from_elem(arity, wild())
|
||||||
};
|
};
|
||||||
Some(vec_ng::append(args, r.tail()))
|
Some(vec::append(args, r.tail()))
|
||||||
}
|
}
|
||||||
DefVariant(_, _, _) => None,
|
DefVariant(_, _, _) => None,
|
||||||
|
|
||||||
|
@ -695,7 +695,7 @@ fn specialize(cx: &MatchCheckCtxt,
|
||||||
}
|
}
|
||||||
None => new_args = Vec::from_elem(arity, wild())
|
None => new_args = Vec::from_elem(arity, wild())
|
||||||
}
|
}
|
||||||
Some(vec_ng::append(new_args, r.tail()))
|
Some(vec::append(new_args, r.tail()))
|
||||||
}
|
}
|
||||||
_ => None
|
_ => None
|
||||||
}
|
}
|
||||||
|
@ -716,7 +716,7 @@ fn specialize(cx: &MatchCheckCtxt,
|
||||||
_ => wild()
|
_ => wild()
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
Some(vec_ng::append(args, r.tail()))
|
Some(vec::append(args, r.tail()))
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
@ -747,15 +747,15 @@ fn specialize(cx: &MatchCheckCtxt,
|
||||||
_ => wild()
|
_ => wild()
|
||||||
}
|
}
|
||||||
}).collect();
|
}).collect();
|
||||||
Some(vec_ng::append(args, r.tail()))
|
Some(vec::append(args, r.tail()))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
PatTup(args) => {
|
PatTup(args) => {
|
||||||
Some(vec_ng::append(args.iter().map(|x| *x).collect(), r.tail()))
|
Some(vec::append(args.iter().map(|x| *x).collect(), r.tail()))
|
||||||
}
|
}
|
||||||
PatUniq(a) | PatRegion(a) => {
|
PatUniq(a) | PatRegion(a) => {
|
||||||
Some(vec_ng::append(vec!(a), r.tail()))
|
Some(vec::append(vec!(a), r.tail()))
|
||||||
}
|
}
|
||||||
PatLit(expr) => {
|
PatLit(expr) => {
|
||||||
let e_v = eval_const_expr(cx.tcx, expr);
|
let e_v = eval_const_expr(cx.tcx, expr);
|
||||||
|
|
|
@ -26,7 +26,7 @@ use syntax::{ast, ast_map, ast_util};
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use collections::HashMap;
|
use collections::HashMap;
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
//
|
//
|
||||||
// This pass classifies expressions by their constant-ness.
|
// This pass classifies expressions by their constant-ness.
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
use std::io;
|
use std::io;
|
||||||
use std::uint;
|
use std::uint;
|
||||||
use std::slice;
|
use std::slice;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::ast_util;
|
use syntax::ast_util;
|
||||||
use syntax::ast_util::IdRange;
|
use syntax::ast_util::IdRange;
|
||||||
|
|
|
@ -19,7 +19,7 @@ use middle::typeck;
|
||||||
use util::nodemap::NodeSet;
|
use util::nodemap::NodeSet;
|
||||||
|
|
||||||
use collections::HashSet;
|
use collections::HashSet;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::ast_map;
|
use syntax::ast_map;
|
||||||
use syntax::ast_util::{local_def, def_id_of_def, is_local};
|
use syntax::ast_util::{local_def, def_id_of_def, is_local};
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
use driver::session;
|
use driver::session;
|
||||||
use driver::session::Session;
|
use driver::session::Session;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast::{Crate, Name, NodeId, Item, ItemFn};
|
use syntax::ast::{Crate, Name, NodeId, Item, ItemFn};
|
||||||
use syntax::ast_map;
|
use syntax::ast_map;
|
||||||
use syntax::attr;
|
use syntax::attr;
|
||||||
|
|
|
@ -17,7 +17,7 @@ use middle::resolve;
|
||||||
use middle::ty;
|
use middle::ty;
|
||||||
use util::nodemap::{NodeMap, NodeSet};
|
use util::nodemap::{NodeMap, NodeSet};
|
||||||
|
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::codemap::Span;
|
use syntax::codemap::Span;
|
||||||
use syntax::{ast, ast_util};
|
use syntax::{ast, ast_util};
|
||||||
use syntax::visit;
|
use syntax::visit;
|
||||||
|
|
|
@ -35,7 +35,7 @@ be indexed by the direction (see the type `Direction`).
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use std::uint;
|
use std::uint;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
pub struct Graph<N,E> {
|
pub struct Graph<N,E> {
|
||||||
priv nodes: Vec<Node<N>> ,
|
priv nodes: Vec<Node<N>> ,
|
||||||
|
|
|
@ -16,7 +16,7 @@ use middle::typeck;
|
||||||
use util::ppaux::{Repr, ty_to_str};
|
use util::ppaux::{Repr, ty_to_str};
|
||||||
use util::ppaux::UserString;
|
use util::ppaux::UserString;
|
||||||
|
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast::*;
|
use syntax::ast::*;
|
||||||
use syntax::attr;
|
use syntax::attr;
|
||||||
use syntax::codemap::Span;
|
use syntax::codemap::Span;
|
||||||
|
|
|
@ -33,7 +33,7 @@ use syntax::visit;
|
||||||
use collections::HashMap;
|
use collections::HashMap;
|
||||||
use std::iter::Enumerate;
|
use std::iter::Enumerate;
|
||||||
use std::slice;
|
use std::slice;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
// The actual lang items defined come at the end of this file in one handy table.
|
// 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.
|
// So you probably just want to nip down to the end.
|
||||||
|
|
|
@ -58,7 +58,7 @@ use std::u16;
|
||||||
use std::u32;
|
use std::u32;
|
||||||
use std::u64;
|
use std::u64;
|
||||||
use std::u8;
|
use std::u8;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use collections::SmallIntMap;
|
use collections::SmallIntMap;
|
||||||
use syntax::ast_map;
|
use syntax::ast_map;
|
||||||
use syntax::ast_util::IdVisitingOperation;
|
use syntax::ast_util::IdVisitingOperation;
|
||||||
|
@ -1121,7 +1121,7 @@ fn check_deprecated_owned_vector(cx: &Context, e: &ast::Expr) {
|
||||||
match ty::get(t).sty {
|
match ty::get(t).sty {
|
||||||
ty::ty_vec(_, ty::vstore_uniq) => {
|
ty::ty_vec(_, ty::vstore_uniq) => {
|
||||||
cx.span_lint(DeprecatedOwnedVector, e.span,
|
cx.span_lint(DeprecatedOwnedVector, e.span,
|
||||||
"use of deprecated `~[]` vector; replaced by `std::vec_ng::Vec`")
|
"use of deprecated `~[]` vector; replaced by `std::vec::Vec`")
|
||||||
}
|
}
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
|
|
|
@ -116,7 +116,7 @@ use std::io;
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use std::str;
|
use std::str;
|
||||||
use std::uint;
|
use std::uint;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast::*;
|
use syntax::ast::*;
|
||||||
use syntax::codemap::Span;
|
use syntax::codemap::Span;
|
||||||
use syntax::parse::token::special_idents;
|
use syntax::parse::token::special_idents;
|
||||||
|
|
|
@ -66,7 +66,7 @@ use middle::ty;
|
||||||
use middle::typeck;
|
use middle::typeck;
|
||||||
use util::ppaux::{ty_to_str, region_ptr_to_str, Repr};
|
use util::ppaux::{ty_to_str, region_ptr_to_str, Repr};
|
||||||
|
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast::{MutImmutable, MutMutable};
|
use syntax::ast::{MutImmutable, MutMutable};
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::codemap::Span;
|
use syntax::codemap::Span;
|
||||||
|
|
|
@ -138,7 +138,7 @@ use util::ppaux::UserString;
|
||||||
use util::nodemap::{NodeMap, NodeSet};
|
use util::nodemap::{NodeMap, NodeSet};
|
||||||
|
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast::*;
|
use syntax::ast::*;
|
||||||
use syntax::ast_util;
|
use syntax::ast_util;
|
||||||
use syntax::visit;
|
use syntax::visit;
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
use middle::resolve;
|
use middle::resolve;
|
||||||
|
|
||||||
use collections::HashMap;
|
use collections::HashMap;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast::*;
|
use syntax::ast::*;
|
||||||
use syntax::ast_util::{path_to_ident, walk_pat};
|
use syntax::ast_util::{path_to_ident, walk_pat};
|
||||||
use syntax::codemap::Span;
|
use syntax::codemap::Span;
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
//! which are available for use externally when compiled as a library.
|
//! which are available for use externally when compiled as a library.
|
||||||
|
|
||||||
use std::mem::replace;
|
use std::mem::replace;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
use metadata::csearch;
|
use metadata::csearch;
|
||||||
use middle::lint;
|
use middle::lint;
|
||||||
|
|
|
@ -20,7 +20,7 @@ use middle::typeck;
|
||||||
use middle::privacy;
|
use middle::privacy;
|
||||||
use util::nodemap::NodeSet;
|
use util::nodemap::NodeSet;
|
||||||
|
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use collections::HashSet;
|
use collections::HashSet;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::ast_map;
|
use syntax::ast_map;
|
||||||
|
|
|
@ -27,7 +27,7 @@ use middle::ty;
|
||||||
use util::nodemap::NodeMap;
|
use util::nodemap::NodeMap;
|
||||||
|
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use collections::{HashMap, HashSet};
|
use collections::{HashMap, HashSet};
|
||||||
use syntax::codemap::Span;
|
use syntax::codemap::Span;
|
||||||
use syntax::{ast, visit};
|
use syntax::{ast, visit};
|
||||||
|
|
|
@ -34,7 +34,7 @@ use syntax::visit::Visitor;
|
||||||
use std::cell::{Cell, RefCell};
|
use std::cell::{Cell, RefCell};
|
||||||
use std::uint;
|
use std::uint;
|
||||||
use std::mem::replace;
|
use std::mem::replace;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use collections::{HashMap, HashSet};
|
use collections::{HashMap, HashSet};
|
||||||
|
|
||||||
// Definition mapping
|
// Definition mapping
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use driver::session::Session;
|
use driver::session::Session;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use util::nodemap::NodeMap;
|
use util::nodemap::NodeMap;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::codemap::Span;
|
use syntax::codemap::Span;
|
||||||
|
|
|
@ -16,7 +16,7 @@ use middle::ty_fold::TypeFolder;
|
||||||
use util::ppaux::Repr;
|
use util::ppaux::Repr;
|
||||||
|
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::codemap::Span;
|
use syntax::codemap::Span;
|
||||||
use syntax::opt_vec::OptVec;
|
use syntax::opt_vec::OptVec;
|
||||||
|
|
||||||
|
|
|
@ -225,8 +225,8 @@ use util::ppaux::{Repr, vec_map_to_str};
|
||||||
|
|
||||||
use collections::HashMap;
|
use collections::HashMap;
|
||||||
use std::cell::Cell;
|
use std::cell::Cell;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::ast::Ident;
|
use syntax::ast::Ident;
|
||||||
use syntax::ast_util::path_to_ident;
|
use syntax::ast_util::path_to_ident;
|
||||||
|
@ -463,9 +463,9 @@ fn expand_nested_bindings<'r,'b>(
|
||||||
m.iter().map(|br| {
|
m.iter().map(|br| {
|
||||||
match br.pats.get(col).node {
|
match br.pats.get(col).node {
|
||||||
ast::PatIdent(_, ref path, Some(inner)) => {
|
ast::PatIdent(_, ref path, Some(inner)) => {
|
||||||
let pats = vec_ng::append(
|
let pats = vec::append(
|
||||||
Vec::from_slice(br.pats.slice(0u, col)),
|
Vec::from_slice(br.pats.slice(0u, col)),
|
||||||
vec_ng::append(vec!(inner),
|
vec::append(vec!(inner),
|
||||||
br.pats.slice(col + 1u,
|
br.pats.slice(col + 1u,
|
||||||
br.pats.len())).as_slice());
|
br.pats.len())).as_slice());
|
||||||
|
|
||||||
|
@ -513,8 +513,8 @@ fn enter_match<'r,'b>(
|
||||||
match e(*br.pats.get(col)) {
|
match e(*br.pats.get(col)) {
|
||||||
Some(sub) => {
|
Some(sub) => {
|
||||||
let pats =
|
let pats =
|
||||||
vec_ng::append(
|
vec::append(
|
||||||
vec_ng::append(sub, br.pats.slice(0u, col)),
|
vec::append(sub, br.pats.slice(0u, col)),
|
||||||
br.pats.slice(col + 1u, br.pats.len()));
|
br.pats.slice(col + 1u, br.pats.len()));
|
||||||
|
|
||||||
let this = *br.pats.get(col);
|
let this = *br.pats.get(col);
|
||||||
|
@ -1537,7 +1537,7 @@ fn compile_submatch_continue<'r,
|
||||||
let tcx = bcx.tcx();
|
let tcx = bcx.tcx();
|
||||||
let dm = tcx.def_map;
|
let dm = tcx.def_map;
|
||||||
|
|
||||||
let vals_left = vec_ng::append(Vec::from_slice(vals.slice(0u, col)),
|
let vals_left = vec::append(Vec::from_slice(vals.slice(0u, col)),
|
||||||
vals.slice(col + 1u, vals.len()));
|
vals.slice(col + 1u, vals.len()));
|
||||||
let ccx = bcx.fcx.ccx;
|
let ccx = bcx.fcx.ccx;
|
||||||
let mut pat_id = 0;
|
let mut pat_id = 0;
|
||||||
|
@ -1570,7 +1570,7 @@ fn compile_submatch_continue<'r,
|
||||||
col,
|
col,
|
||||||
rec_fields.as_slice(),
|
rec_fields.as_slice(),
|
||||||
val).as_slice(),
|
val).as_slice(),
|
||||||
vec_ng::append(rec_vals,
|
vec::append(rec_vals,
|
||||||
vals_left.as_slice()).as_slice(),
|
vals_left.as_slice()).as_slice(),
|
||||||
chk);
|
chk);
|
||||||
});
|
});
|
||||||
|
@ -1596,7 +1596,7 @@ fn compile_submatch_continue<'r,
|
||||||
col,
|
col,
|
||||||
val,
|
val,
|
||||||
n_tup_elts).as_slice(),
|
n_tup_elts).as_slice(),
|
||||||
vec_ng::append(tup_vals,
|
vec::append(tup_vals,
|
||||||
vals_left.as_slice()).as_slice(),
|
vals_left.as_slice()).as_slice(),
|
||||||
chk);
|
chk);
|
||||||
return;
|
return;
|
||||||
|
@ -1622,7 +1622,7 @@ fn compile_submatch_continue<'r,
|
||||||
compile_submatch(bcx,
|
compile_submatch(bcx,
|
||||||
enter_tuple_struct(bcx, dm, m, col, val,
|
enter_tuple_struct(bcx, dm, m, col, val,
|
||||||
struct_element_count).as_slice(),
|
struct_element_count).as_slice(),
|
||||||
vec_ng::append(llstructvals,
|
vec::append(llstructvals,
|
||||||
vals_left.as_slice()).as_slice(),
|
vals_left.as_slice()).as_slice(),
|
||||||
chk);
|
chk);
|
||||||
return;
|
return;
|
||||||
|
@ -1632,7 +1632,7 @@ fn compile_submatch_continue<'r,
|
||||||
let llbox = Load(bcx, val);
|
let llbox = Load(bcx, val);
|
||||||
compile_submatch(bcx,
|
compile_submatch(bcx,
|
||||||
enter_uniq(bcx, dm, m, col, val).as_slice(),
|
enter_uniq(bcx, dm, m, col, val).as_slice(),
|
||||||
vec_ng::append(vec!(llbox),
|
vec::append(vec!(llbox),
|
||||||
vals_left.as_slice()).as_slice(),
|
vals_left.as_slice()).as_slice(),
|
||||||
chk);
|
chk);
|
||||||
return;
|
return;
|
||||||
|
@ -1642,7 +1642,7 @@ fn compile_submatch_continue<'r,
|
||||||
let loaded_val = Load(bcx, val);
|
let loaded_val = Load(bcx, val);
|
||||||
compile_submatch(bcx,
|
compile_submatch(bcx,
|
||||||
enter_region(bcx, dm, m, col, val).as_slice(),
|
enter_region(bcx, dm, m, col, val).as_slice(),
|
||||||
vec_ng::append(vec!(loaded_val),
|
vec::append(vec!(loaded_val),
|
||||||
vals_left.as_slice()).as_slice(),
|
vals_left.as_slice()).as_slice(),
|
||||||
chk);
|
chk);
|
||||||
return;
|
return;
|
||||||
|
@ -1824,7 +1824,7 @@ fn compile_submatch_continue<'r,
|
||||||
lit(_) | range(_, _) => ()
|
lit(_) | range(_, _) => ()
|
||||||
}
|
}
|
||||||
let opt_ms = enter_opt(opt_cx, m, opt, col, size, val);
|
let opt_ms = enter_opt(opt_cx, m, opt, col, size, val);
|
||||||
let opt_vals = vec_ng::append(unpacked, vals_left.as_slice());
|
let opt_vals = vec::append(unpacked, vals_left.as_slice());
|
||||||
|
|
||||||
match branch_chk {
|
match branch_chk {
|
||||||
None => {
|
None => {
|
||||||
|
|
|
@ -57,8 +57,8 @@ use middle::trans::type_::Type;
|
||||||
use middle::trans::type_of;
|
use middle::trans::type_of;
|
||||||
use middle::ty;
|
use middle::ty;
|
||||||
use middle::ty::Disr;
|
use middle::ty::Disr;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
use syntax::abi::{X86, X86_64, Arm, Mips};
|
use syntax::abi::{X86, X86_64, Arm, Mips};
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::attr;
|
use syntax::attr;
|
||||||
|
@ -226,7 +226,7 @@ fn represent_type_uncached(cx: &CrateContext, t: ty::t) -> Repr {
|
||||||
return General(ity, cases.map(|c| {
|
return General(ity, cases.map(|c| {
|
||||||
let discr = vec!(ty_of_inttype(ity));
|
let discr = vec!(ty_of_inttype(ity));
|
||||||
mk_struct(cx,
|
mk_struct(cx,
|
||||||
vec_ng::append(discr, c.tys.as_slice()).as_slice(),
|
vec::append(discr, c.tys.as_slice()).as_slice(),
|
||||||
false)
|
false)
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
@ -758,10 +758,10 @@ pub fn trans_const(ccx: &CrateContext, r: &Repr, discr: Disr,
|
||||||
let lldiscr = C_integral(ll_inttype(ccx, ity), discr as u64, true);
|
let lldiscr = C_integral(ll_inttype(ccx, ity), discr as u64, true);
|
||||||
let contents = build_const_struct(ccx,
|
let contents = build_const_struct(ccx,
|
||||||
case,
|
case,
|
||||||
vec_ng::append(
|
vec::append(
|
||||||
vec!(lldiscr),
|
vec!(lldiscr),
|
||||||
vals).as_slice());
|
vals).as_slice());
|
||||||
C_struct(ccx, vec_ng::append(
|
C_struct(ccx, vec::append(
|
||||||
contents,
|
contents,
|
||||||
&[padding(ccx, max_sz - case.size)]).as_slice(),
|
&[padding(ccx, max_sz - case.size)]).as_slice(),
|
||||||
false)
|
false)
|
||||||
|
|
|
@ -23,7 +23,7 @@ use middle::trans::type_of;
|
||||||
use middle::trans::type_::Type;
|
use middle::trans::type_::Type;
|
||||||
|
|
||||||
use std::c_str::ToCStr;
|
use std::c_str::ToCStr;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
|
|
||||||
// Take an inline assembly expression and splat it out via LLVM
|
// Take an inline assembly expression and splat it out via LLVM
|
||||||
|
|
|
@ -76,7 +76,7 @@ use std::c_str::ToCStr;
|
||||||
use std::cell::{Cell, RefCell};
|
use std::cell::{Cell, RefCell};
|
||||||
use std::libc::c_uint;
|
use std::libc::c_uint;
|
||||||
use std::local_data;
|
use std::local_data;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::abi::{X86, X86_64, Arm, Mips, Rust, RustIntrinsic, OsWin32};
|
use syntax::abi::{X86, X86_64, Arm, Mips, Rust, RustIntrinsic, OsWin32};
|
||||||
use syntax::ast_map::PathName;
|
use syntax::ast_map::PathName;
|
||||||
use syntax::ast_util::{local_def, is_local};
|
use syntax::ast_util::{local_def, is_local};
|
||||||
|
|
|
@ -20,7 +20,7 @@ use middle::trans::type_::Type;
|
||||||
|
|
||||||
use collections::HashMap;
|
use collections::HashMap;
|
||||||
use std::libc::{c_uint, c_ulonglong, c_char};
|
use std::libc::{c_uint, c_ulonglong, c_char};
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::codemap::Span;
|
use syntax::codemap::Span;
|
||||||
|
|
||||||
pub struct Builder<'a> {
|
pub struct Builder<'a> {
|
||||||
|
|
|
@ -16,7 +16,7 @@ use middle::trans::cabi_x86_64;
|
||||||
use middle::trans::cabi_arm;
|
use middle::trans::cabi_arm;
|
||||||
use middle::trans::cabi_mips;
|
use middle::trans::cabi_mips;
|
||||||
use middle::trans::type_::Type;
|
use middle::trans::type_::Type;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::abi::{X86, X86_64, Arm, Mips};
|
use syntax::abi::{X86, X86_64, Arm, Mips};
|
||||||
|
|
||||||
#[deriving(Clone, Eq)]
|
#[deriving(Clone, Eq)]
|
||||||
|
|
|
@ -18,7 +18,7 @@ use middle::trans::type_::Type;
|
||||||
|
|
||||||
use std::cmp;
|
use std::cmp;
|
||||||
use std::option::{None, Some};
|
use std::option::{None, Some};
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
fn align_up_to(off: uint, a: uint) -> uint {
|
fn align_up_to(off: uint, a: uint) -> uint {
|
||||||
return (off + a - 1u) / a * a;
|
return (off + a - 1u) / a * a;
|
||||||
|
|
|
@ -18,7 +18,7 @@ use middle::trans::context::CrateContext;
|
||||||
use middle::trans::cabi::*;
|
use middle::trans::cabi::*;
|
||||||
use middle::trans::type_::Type;
|
use middle::trans::type_::Type;
|
||||||
|
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
fn align_up_to(off: uint, a: uint) -> uint {
|
fn align_up_to(off: uint, a: uint) -> uint {
|
||||||
return (off + a - 1u) / a * a;
|
return (off + a - 1u) / a * a;
|
||||||
|
|
|
@ -15,7 +15,7 @@ use super::cabi::*;
|
||||||
use super::common::*;
|
use super::common::*;
|
||||||
use super::machine::*;
|
use super::machine::*;
|
||||||
use middle::trans::type_::Type;
|
use middle::trans::type_::Type;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
pub fn compute_abi_info(ccx: &CrateContext,
|
pub fn compute_abi_info(ccx: &CrateContext,
|
||||||
atys: &[Type],
|
atys: &[Type],
|
||||||
|
|
|
@ -21,7 +21,7 @@ use middle::trans::context::CrateContext;
|
||||||
use middle::trans::type_::Type;
|
use middle::trans::type_::Type;
|
||||||
|
|
||||||
use std::cmp;
|
use std::cmp;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
#[deriving(Clone, Eq)]
|
#[deriving(Clone, Eq)]
|
||||||
enum RegClass {
|
enum RegClass {
|
||||||
|
|
|
@ -49,8 +49,8 @@ use util::ppaux::Repr;
|
||||||
|
|
||||||
use middle::trans::type_::Type;
|
use middle::trans::type_::Type;
|
||||||
|
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::abi::AbiSet;
|
use syntax::abi::AbiSet;
|
||||||
use syntax::ast_map;
|
use syntax::ast_map;
|
||||||
|
@ -233,7 +233,7 @@ fn resolve_default_method_vtables(bcx: &Block,
|
||||||
None => slice::from_elem(num_method_vtables, @Vec::new())
|
None => slice::from_elem(num_method_vtables, @Vec::new())
|
||||||
};
|
};
|
||||||
|
|
||||||
let param_vtables = @(vec_ng::append((*trait_vtables_fixed).clone(),
|
let param_vtables = @(vec::append((*trait_vtables_fixed).clone(),
|
||||||
method_vtables));
|
method_vtables));
|
||||||
|
|
||||||
let self_vtables = resolve_param_vtables_under_param_substs(
|
let self_vtables = resolve_param_vtables_under_param_substs(
|
||||||
|
|
|
@ -27,7 +27,7 @@ use util::ppaux::Repr;
|
||||||
use util::ppaux::ty_to_str;
|
use util::ppaux::ty_to_str;
|
||||||
|
|
||||||
use arena::TypedArena;
|
use arena::TypedArena;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::ast_util;
|
use syntax::ast_util;
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ use collections::HashMap;
|
||||||
use std::c_str::ToCStr;
|
use std::c_str::ToCStr;
|
||||||
use std::cell::{Cell, RefCell};
|
use std::cell::{Cell, RefCell};
|
||||||
use std::libc::{c_uint, c_longlong, c_ulonglong, c_char};
|
use std::libc::{c_uint, c_longlong, c_ulonglong, c_char};
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast::Ident;
|
use syntax::ast::Ident;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::ast_map::{PathElem, PathName};
|
use syntax::ast_map::{PathElem, PathName};
|
||||||
|
|
|
@ -34,8 +34,8 @@ use util::ppaux::{Repr, ty_to_str};
|
||||||
use std::c_str::ToCStr;
|
use std::c_str::ToCStr;
|
||||||
use std::libc::c_uint;
|
use std::libc::c_uint;
|
||||||
use std::slice;
|
use std::slice;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
use syntax::{ast, ast_util};
|
use syntax::{ast, ast_util};
|
||||||
|
|
||||||
pub fn const_lit(cx: &CrateContext, e: &ast::Expr, lit: ast::Lit)
|
pub fn const_lit(cx: &CrateContext, e: &ast::Expr, lit: ast::Lit)
|
||||||
|
@ -304,7 +304,7 @@ fn const_expr_unadjusted(cx: &CrateContext, e: &ast::Expr,
|
||||||
exprs.iter().map(|&e| const_expr(cx, e, is_local))
|
exprs.iter().map(|&e| const_expr(cx, e, is_local))
|
||||||
.fold((Vec::new(), true),
|
.fold((Vec::new(), true),
|
||||||
|(l, all_inlineable), (val, inlineable)| {
|
|(l, all_inlineable), (val, inlineable)| {
|
||||||
(vec_ng::append_one(l, val), all_inlineable && inlineable)
|
(vec::append_one(l, val), all_inlineable && inlineable)
|
||||||
})
|
})
|
||||||
};
|
};
|
||||||
unsafe {
|
unsafe {
|
||||||
|
|
|
@ -33,7 +33,7 @@ use std::cell::{Cell, RefCell};
|
||||||
use std::c_str::ToCStr;
|
use std::c_str::ToCStr;
|
||||||
use std::libc::c_uint;
|
use std::libc::c_uint;
|
||||||
use std::ptr;
|
use std::ptr;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use collections::{HashMap, HashSet};
|
use collections::{HashMap, HashSet};
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::parse::token::InternedString;
|
use syntax::parse::token::InternedString;
|
||||||
|
|
|
@ -149,7 +149,7 @@ use std::libc::{c_uint, c_ulonglong, c_longlong};
|
||||||
use std::ptr;
|
use std::ptr;
|
||||||
use std::sync::atomics;
|
use std::sync::atomics;
|
||||||
use std::slice;
|
use std::slice;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::codemap::{Span, Pos};
|
use syntax::codemap::{Span, Pos};
|
||||||
use syntax::{abi, ast, codemap, ast_util, ast_map, opt_vec};
|
use syntax::{abi, ast, codemap, ast_util, ast_map, opt_vec};
|
||||||
use syntax::parse::token;
|
use syntax::parse::token;
|
||||||
|
|
|
@ -71,7 +71,7 @@ use middle::trans::machine::llsize_of;
|
||||||
use middle::trans::type_::Type;
|
use middle::trans::type_::Type;
|
||||||
|
|
||||||
use std::slice;
|
use std::slice;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::codemap;
|
use syntax::codemap;
|
||||||
use syntax::print::pprust::{expr_to_str};
|
use syntax::print::pprust::{expr_to_str};
|
||||||
|
|
|
@ -27,7 +27,7 @@ use middle::ty::FnSig;
|
||||||
use middle::ty;
|
use middle::ty;
|
||||||
use std::cmp;
|
use std::cmp;
|
||||||
use std::libc::c_uint;
|
use std::libc::c_uint;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::abi::{Cdecl, Aapcs, C, AbiSet, Win64};
|
use syntax::abi::{Cdecl, Aapcs, C, AbiSet, Win64};
|
||||||
use syntax::abi::{RustIntrinsic, Rust, Stdcall, Fastcall, System};
|
use syntax::abi::{RustIntrinsic, Rust, Stdcall, Fastcall, System};
|
||||||
use syntax::codemap::Span;
|
use syntax::codemap::Span;
|
||||||
|
|
|
@ -25,7 +25,7 @@ use middle::trans::machine;
|
||||||
use middle::trans::machine::llsize_of;
|
use middle::trans::machine::llsize_of;
|
||||||
use middle::trans::type_::Type;
|
use middle::trans::type_::Type;
|
||||||
use middle::ty;
|
use middle::ty;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::ast_map;
|
use syntax::ast_map;
|
||||||
use syntax::parse::token;
|
use syntax::parse::token;
|
||||||
|
|
|
@ -34,8 +34,8 @@ use util::common::indenter;
|
||||||
use util::ppaux::Repr;
|
use util::ppaux::Repr;
|
||||||
|
|
||||||
use std::c_str::ToCStr;
|
use std::c_str::ToCStr;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
use syntax::parse::token;
|
use syntax::parse::token;
|
||||||
use syntax::{ast, ast_map, visit};
|
use syntax::{ast, ast_map, visit};
|
||||||
|
|
||||||
|
@ -324,7 +324,7 @@ fn combine_impl_and_methods_tps(bcx: &Block,
|
||||||
let node_substs = node_id_type_params(bcx, node);
|
let node_substs = node_id_type_params(bcx, node);
|
||||||
debug!("rcvr_substs={:?}", rcvr_substs.repr(ccx.tcx()));
|
debug!("rcvr_substs={:?}", rcvr_substs.repr(ccx.tcx()));
|
||||||
let ty_substs
|
let ty_substs
|
||||||
= vec_ng::append(Vec::from_slice(rcvr_substs),
|
= vec::append(Vec::from_slice(rcvr_substs),
|
||||||
node_substs.tailn(node_substs.len() - n_m_tps));
|
node_substs.tailn(node_substs.len() - n_m_tps));
|
||||||
debug!("n_m_tps={:?}", n_m_tps);
|
debug!("n_m_tps={:?}", n_m_tps);
|
||||||
debug!("node_substs={:?}", node_substs.repr(ccx.tcx()));
|
debug!("node_substs={:?}", node_substs.repr(ccx.tcx()));
|
||||||
|
@ -348,7 +348,7 @@ fn combine_impl_and_methods_tps(bcx: &Block,
|
||||||
None => @Vec::from_elem(node_substs.len(), @Vec::new())
|
None => @Vec::from_elem(node_substs.len(), @Vec::new())
|
||||||
};
|
};
|
||||||
let vtables
|
let vtables
|
||||||
= @vec_ng::append(Vec::from_slice(rcvr_origins.as_slice()),
|
= @vec::append(Vec::from_slice(rcvr_origins.as_slice()),
|
||||||
r_m_origins.tailn(r_m_origins.len() - n_m_tps));
|
r_m_origins.tailn(r_m_origins.len() - n_m_tps));
|
||||||
|
|
||||||
(ty_substs, vtables)
|
(ty_substs, vtables)
|
||||||
|
|
|
@ -23,7 +23,7 @@ use middle::ty;
|
||||||
use middle::typeck;
|
use middle::typeck;
|
||||||
use util::ppaux::Repr;
|
use util::ppaux::Repr;
|
||||||
|
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::ast_map;
|
use syntax::ast_map;
|
||||||
use syntax::ast_util::local_def;
|
use syntax::ast_util::local_def;
|
||||||
|
|
|
@ -28,8 +28,8 @@ use util::ppaux::ty_to_str;
|
||||||
use arena::TypedArena;
|
use arena::TypedArena;
|
||||||
use std::libc::c_uint;
|
use std::libc::c_uint;
|
||||||
use std::option::{Some,None};
|
use std::option::{Some,None};
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
use syntax::ast::DefId;
|
use syntax::ast::DefId;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::ast_map;
|
use syntax::ast_map;
|
||||||
|
@ -134,7 +134,7 @@ impl<'a> Reflector<'a> {
|
||||||
-> (~str, Vec<ValueRef> ) {
|
-> (~str, Vec<ValueRef> ) {
|
||||||
match vstore {
|
match vstore {
|
||||||
ty::vstore_fixed(n) => {
|
ty::vstore_fixed(n) => {
|
||||||
let extra = vec_ng::append(vec!(self.c_uint(n)),
|
let extra = vec::append(vec!(self.c_uint(n)),
|
||||||
self.c_size_and_align(t)
|
self.c_size_and_align(t)
|
||||||
.as_slice());
|
.as_slice());
|
||||||
(~"fixed", extra)
|
(~"fixed", extra)
|
||||||
|
@ -184,7 +184,7 @@ impl<'a> Reflector<'a> {
|
||||||
}
|
}
|
||||||
ty::ty_vec(ref mt, vst) => {
|
ty::ty_vec(ref mt, vst) => {
|
||||||
let (name, extra) = self.vstore_name_and_extra(t, vst);
|
let (name, extra) = self.vstore_name_and_extra(t, vst);
|
||||||
let extra = vec_ng::append(extra, self.c_mt(mt).as_slice());
|
let extra = vec::append(extra, self.c_mt(mt).as_slice());
|
||||||
self.visit(~"evec_" + name, extra.as_slice())
|
self.visit(~"evec_" + name, extra.as_slice())
|
||||||
}
|
}
|
||||||
// Should remove mt from box and uniq.
|
// Should remove mt from box and uniq.
|
||||||
|
@ -212,7 +212,7 @@ impl<'a> Reflector<'a> {
|
||||||
}
|
}
|
||||||
|
|
||||||
ty::ty_tup(ref tys) => {
|
ty::ty_tup(ref tys) => {
|
||||||
let extra = vec_ng::append(vec!(self.c_uint(tys.len())),
|
let extra = vec::append(vec!(self.c_uint(tys.len())),
|
||||||
self.c_size_and_align(t).as_slice());
|
self.c_size_and_align(t).as_slice());
|
||||||
self.bracketed("tup", extra.as_slice(), |this| {
|
self.bracketed("tup", extra.as_slice(), |this| {
|
||||||
for (i, t) in tys.iter().enumerate() {
|
for (i, t) in tys.iter().enumerate() {
|
||||||
|
@ -260,7 +260,7 @@ impl<'a> Reflector<'a> {
|
||||||
special_idents::unnamed_field.name;
|
special_idents::unnamed_field.name;
|
||||||
}
|
}
|
||||||
|
|
||||||
let extra = vec_ng::append(vec!(
|
let extra = vec::append(vec!(
|
||||||
self.c_slice(token::intern_and_get_ident(ty_to_str(tcx,
|
self.c_slice(token::intern_and_get_ident(ty_to_str(tcx,
|
||||||
t))),
|
t))),
|
||||||
self.c_bool(named_fields),
|
self.c_bool(named_fields),
|
||||||
|
@ -268,7 +268,7 @@ impl<'a> Reflector<'a> {
|
||||||
), self.c_size_and_align(t).as_slice());
|
), self.c_size_and_align(t).as_slice());
|
||||||
self.bracketed("class", extra.as_slice(), |this| {
|
self.bracketed("class", extra.as_slice(), |this| {
|
||||||
for (i, field) in fields.iter().enumerate() {
|
for (i, field) in fields.iter().enumerate() {
|
||||||
let extra = vec_ng::append(vec!(
|
let extra = vec::append(vec!(
|
||||||
this.c_uint(i),
|
this.c_uint(i),
|
||||||
this.c_slice(token::get_ident(field.ident)),
|
this.c_slice(token::get_ident(field.ident)),
|
||||||
this.c_bool(named_fields)
|
this.c_bool(named_fields)
|
||||||
|
@ -321,7 +321,7 @@ impl<'a> Reflector<'a> {
|
||||||
llfdecl
|
llfdecl
|
||||||
};
|
};
|
||||||
|
|
||||||
let enum_args = vec_ng::append(vec!(self.c_uint(variants.len()),
|
let enum_args = vec::append(vec!(self.c_uint(variants.len()),
|
||||||
make_get_disr()),
|
make_get_disr()),
|
||||||
self.c_size_and_align(t)
|
self.c_size_and_align(t)
|
||||||
.as_slice());
|
.as_slice());
|
||||||
|
|
|
@ -21,7 +21,7 @@ use syntax::abi::{X86, X86_64, Arm, Mips};
|
||||||
use std::c_str::ToCStr;
|
use std::c_str::ToCStr;
|
||||||
use std::cast;
|
use std::cast;
|
||||||
use std::slice;
|
use std::slice;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
use std::libc::{c_uint};
|
use std::libc::{c_uint};
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ use util::ppaux::Repr;
|
||||||
|
|
||||||
use middle::trans::type_::Type;
|
use middle::trans::type_::Type;
|
||||||
|
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::opt_vec;
|
use syntax::opt_vec;
|
||||||
|
|
||||||
|
|
|
@ -40,8 +40,8 @@ use std::fmt;
|
||||||
use std::hash::{Hash, sip};
|
use std::hash::{Hash, sip};
|
||||||
use std::ops;
|
use std::ops;
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
use collections::{HashMap, HashSet};
|
use collections::{HashMap, HashSet};
|
||||||
use syntax::ast::*;
|
use syntax::ast::*;
|
||||||
use syntax::ast_util::{is_local, lit_is_str};
|
use syntax::ast_util::{is_local, lit_is_str};
|
||||||
|
@ -2901,7 +2901,7 @@ pub fn replace_closure_return_type(tcx: &ctxt, fn_type: t, ret_type: t) -> t {
|
||||||
|
|
||||||
// Returns a vec of all the input and output types of fty.
|
// Returns a vec of all the input and output types of fty.
|
||||||
pub fn tys_in_fn_sig(sig: &FnSig) -> Vec<t> {
|
pub fn tys_in_fn_sig(sig: &FnSig) -> Vec<t> {
|
||||||
vec_ng::append_one(sig.inputs.map(|a| *a), sig.output)
|
vec::append_one(sig.inputs.map(|a| *a), sig.output)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Type accessors for AST nodes
|
// Type accessors for AST nodes
|
||||||
|
@ -3234,7 +3234,7 @@ pub fn method_call_type_param_defs(tcx: &ctxt, origin: typeck::MethodOrigin)
|
||||||
// trait itself. This ought to be harmonized.
|
// trait itself. This ought to be harmonized.
|
||||||
let trait_type_param_defs =
|
let trait_type_param_defs =
|
||||||
lookup_trait_def(tcx, trt_id).generics.type_param_defs();
|
lookup_trait_def(tcx, trt_id).generics.type_param_defs();
|
||||||
Rc::new(vec_ng::append(
|
Rc::new(vec::append(
|
||||||
Vec::from_slice(trait_type_param_defs),
|
Vec::from_slice(trait_type_param_defs),
|
||||||
ty::trait_method(tcx,
|
ty::trait_method(tcx,
|
||||||
trt_id,
|
trt_id,
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
use middle::ty;
|
use middle::ty;
|
||||||
use util::ppaux::Repr;
|
use util::ppaux::Repr;
|
||||||
|
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
pub trait TypeFolder {
|
pub trait TypeFolder {
|
||||||
fn tcx<'a>(&'a self) -> &'a ty::ctxt;
|
fn tcx<'a>(&'a self) -> &'a ty::ctxt;
|
||||||
|
|
|
@ -60,7 +60,7 @@ use middle::typeck::rscope::{RegionScope};
|
||||||
use middle::typeck::lookup_def_tcx;
|
use middle::typeck::lookup_def_tcx;
|
||||||
use util::ppaux::Repr;
|
use util::ppaux::Repr;
|
||||||
|
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::abi::AbiSet;
|
use syntax::abi::AbiSet;
|
||||||
use syntax::{ast, ast_util};
|
use syntax::{ast, ast_util};
|
||||||
use syntax::codemap::Span;
|
use syntax::codemap::Span;
|
||||||
|
|
|
@ -20,7 +20,7 @@ use middle::typeck::infer;
|
||||||
use middle::typeck::require_same_types;
|
use middle::typeck::require_same_types;
|
||||||
|
|
||||||
use collections::{HashMap, HashSet};
|
use collections::{HashMap, HashSet};
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::ast_util;
|
use syntax::ast_util;
|
||||||
use syntax::parse::token;
|
use syntax::parse::token;
|
||||||
|
|
|
@ -97,8 +97,8 @@ use util::ppaux::Repr;
|
||||||
|
|
||||||
use collections::HashSet;
|
use collections::HashSet;
|
||||||
use std::result;
|
use std::result;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
use syntax::ast::{DefId, SelfValue, SelfRegion};
|
use syntax::ast::{DefId, SelfValue, SelfRegion};
|
||||||
use syntax::ast::{SelfUniq, SelfStatic};
|
use syntax::ast::{SelfUniq, SelfStatic};
|
||||||
use syntax::ast::{MutMutable, MutImmutable};
|
use syntax::ast::{MutMutable, MutImmutable};
|
||||||
|
@ -1118,7 +1118,7 @@ impl<'a> LookupContext<'a> {
|
||||||
// Construct the full set of type parameters for the method,
|
// Construct the full set of type parameters for the method,
|
||||||
// which is equal to the class tps + the method tps.
|
// which is equal to the class tps + the method tps.
|
||||||
let all_substs = substs {
|
let all_substs = substs {
|
||||||
tps: vec_ng::append(candidate.rcvr_substs.tps.clone(),
|
tps: vec::append(candidate.rcvr_substs.tps.clone(),
|
||||||
m_substs.as_slice()),
|
m_substs.as_slice()),
|
||||||
regions: NonerasedRegions(all_regions),
|
regions: NonerasedRegions(all_regions),
|
||||||
self_ty: candidate.rcvr_substs.self_ty,
|
self_ty: candidate.rcvr_substs.self_ty,
|
||||||
|
|
|
@ -119,8 +119,8 @@ use collections::HashMap;
|
||||||
use std::mem::replace;
|
use std::mem::replace;
|
||||||
use std::result;
|
use std::result;
|
||||||
use std::slice;
|
use std::slice;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
use syntax::abi::AbiSet;
|
use syntax::abi::AbiSet;
|
||||||
use syntax::ast::{Provided, Required};
|
use syntax::ast::{Provided, Required};
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
|
@ -910,7 +910,7 @@ fn compare_impl_method(tcx: &ty::ctxt,
|
||||||
bound_region: ty::BrNamed(l.def_id, l.name)})).
|
bound_region: ty::BrNamed(l.def_id, l.name)})).
|
||||||
collect();
|
collect();
|
||||||
let dummy_substs = ty::substs {
|
let dummy_substs = ty::substs {
|
||||||
tps: vec_ng::append(dummy_impl_tps, dummy_method_tps.as_slice()),
|
tps: vec::append(dummy_impl_tps, dummy_method_tps.as_slice()),
|
||||||
regions: ty::NonerasedRegions(dummy_impl_regions),
|
regions: ty::NonerasedRegions(dummy_impl_regions),
|
||||||
self_ty: None };
|
self_ty: None };
|
||||||
|
|
||||||
|
@ -937,7 +937,7 @@ fn compare_impl_method(tcx: &ty::ctxt,
|
||||||
self_ty: self_ty } = trait_substs.subst(tcx, &dummy_substs);
|
self_ty: self_ty } = trait_substs.subst(tcx, &dummy_substs);
|
||||||
let substs = substs {
|
let substs = substs {
|
||||||
regions: trait_regions,
|
regions: trait_regions,
|
||||||
tps: vec_ng::append(trait_tps, dummy_method_tps.as_slice()),
|
tps: vec::append(trait_tps, dummy_method_tps.as_slice()),
|
||||||
self_ty: self_ty,
|
self_ty: self_ty,
|
||||||
};
|
};
|
||||||
debug!("trait_fty (pre-subst): {} substs={}",
|
debug!("trait_fty (pre-subst): {} substs={}",
|
||||||
|
|
|
@ -15,7 +15,7 @@ use middle::ty_fold;
|
||||||
use middle::ty_fold::TypeFolder;
|
use middle::ty_fold::TypeFolder;
|
||||||
|
|
||||||
use collections::HashMap;
|
use collections::HashMap;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use util::ppaux::Repr;
|
use util::ppaux::Repr;
|
||||||
use util::ppaux;
|
use util::ppaux;
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@ use util::ppaux::Repr;
|
||||||
use collections::HashSet;
|
use collections::HashSet;
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::result;
|
use std::result;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::ast_util;
|
use syntax::ast_util;
|
||||||
use syntax::codemap::Span;
|
use syntax::codemap::Span;
|
||||||
|
|
|
@ -28,7 +28,7 @@ use middle::typeck::write_ty_to_tcx;
|
||||||
use util::ppaux;
|
use util::ppaux;
|
||||||
use util::ppaux::Repr;
|
use util::ppaux::Repr;
|
||||||
|
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::codemap::Span;
|
use syntax::codemap::Span;
|
||||||
use syntax::print::pprust::pat_to_str;
|
use syntax::print::pprust::pat_to_str;
|
||||||
|
|
|
@ -48,8 +48,8 @@ use syntax::visit;
|
||||||
use collections::HashSet;
|
use collections::HashSet;
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
|
|
||||||
struct UniversalQuantificationResult {
|
struct UniversalQuantificationResult {
|
||||||
monotype: t,
|
monotype: t,
|
||||||
|
@ -347,7 +347,7 @@ impl<'a> CoherenceChecker<'a> {
|
||||||
// construct the polytype for the method based on the method_ty
|
// construct the polytype for the method based on the method_ty
|
||||||
let new_generics = ty::Generics {
|
let new_generics = ty::Generics {
|
||||||
type_param_defs:
|
type_param_defs:
|
||||||
Rc::new(vec_ng::append(
|
Rc::new(vec::append(
|
||||||
Vec::from_slice(impl_poly_type.generics
|
Vec::from_slice(impl_poly_type.generics
|
||||||
.type_param_defs()),
|
.type_param_defs()),
|
||||||
new_method_ty.generics.type_param_defs())),
|
new_method_ty.generics.type_param_defs())),
|
||||||
|
|
|
@ -46,8 +46,8 @@ use util::ppaux;
|
||||||
use util::ppaux::Repr;
|
use util::ppaux::Repr;
|
||||||
|
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use std::vec_ng;
|
use std::vec;
|
||||||
use collections::HashSet;
|
use collections::HashSet;
|
||||||
|
|
||||||
use syntax::abi::AbiSet;
|
use syntax::abi::AbiSet;
|
||||||
|
@ -330,7 +330,7 @@ pub fn ensure_trait_methods(ccx: &CrateCtxt, trait_id: ast::NodeId) {
|
||||||
let substs = substs {
|
let substs = substs {
|
||||||
regions: ty::NonerasedRegions(rps_from_trait),
|
regions: ty::NonerasedRegions(rps_from_trait),
|
||||||
self_ty: Some(self_param),
|
self_ty: Some(self_param),
|
||||||
tps: vec_ng::append(non_shifted_trait_tps,
|
tps: vec::append(non_shifted_trait_tps,
|
||||||
shifted_method_tps.as_slice())
|
shifted_method_tps.as_slice())
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -510,11 +510,11 @@ fn convert_methods(ccx: &CrateCtxt,
|
||||||
// itself
|
// itself
|
||||||
ty_param_bounds_and_ty {
|
ty_param_bounds_and_ty {
|
||||||
generics: ty::Generics {
|
generics: ty::Generics {
|
||||||
type_param_defs: Rc::new(vec_ng::append(
|
type_param_defs: Rc::new(vec::append(
|
||||||
Vec::from_slice(
|
Vec::from_slice(
|
||||||
rcvr_ty_generics.type_param_defs()),
|
rcvr_ty_generics.type_param_defs()),
|
||||||
m_ty_generics.type_param_defs())),
|
m_ty_generics.type_param_defs())),
|
||||||
region_param_defs: Rc::new(vec_ng::append(
|
region_param_defs: Rc::new(vec::append(
|
||||||
Vec::from_slice(rcvr_ty_generics.region_param_defs()),
|
Vec::from_slice(rcvr_ty_generics.region_param_defs()),
|
||||||
m_ty_generics.region_param_defs())),
|
m_ty_generics.region_param_defs())),
|
||||||
},
|
},
|
||||||
|
|
|
@ -63,7 +63,7 @@ use util::common::indent;
|
||||||
use util::ppaux::Repr;
|
use util::ppaux::Repr;
|
||||||
|
|
||||||
use std::result;
|
use std::result;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast::{Onceness, Purity};
|
use syntax::ast::{Onceness, Purity};
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::opt_vec;
|
use syntax::opt_vec;
|
||||||
|
|
|
@ -76,7 +76,7 @@ use middle::typeck::infer::region_inference::ProcessedErrors;
|
||||||
use middle::typeck::infer::region_inference::SameRegions;
|
use middle::typeck::infer::region_inference::SameRegions;
|
||||||
use std::cell::{Cell, RefCell};
|
use std::cell::{Cell, RefCell};
|
||||||
use std::char::from_u32;
|
use std::char::from_u32;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::ast_map;
|
use syntax::ast_map;
|
||||||
use syntax::ast_util;
|
use syntax::ast_util;
|
||||||
|
|
|
@ -46,7 +46,7 @@ use middle::typeck::infer::to_str::InferStr;
|
||||||
use util::common::indenter;
|
use util::common::indenter;
|
||||||
|
|
||||||
use collections::HashMap;
|
use collections::HashMap;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
|
|
||||||
pub trait LatticeValue {
|
pub trait LatticeValue {
|
||||||
fn sub(cf: &CombineFields, a: &Self, b: &Self) -> ures;
|
fn sub(cf: &CombineFields, a: &Self, b: &Self) -> ures;
|
||||||
|
|
|
@ -39,7 +39,7 @@ use middle::typeck::infer::unify::{ValsAndBindings, Root};
|
||||||
use middle::typeck::infer::error_reporting::ErrorReporting;
|
use middle::typeck::infer::error_reporting::ErrorReporting;
|
||||||
use std::cell::{Cell, RefCell};
|
use std::cell::{Cell, RefCell};
|
||||||
use std::result;
|
use std::result;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast::{MutImmutable, MutMutable};
|
use syntax::ast::{MutImmutable, MutMutable};
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::codemap;
|
use syntax::codemap;
|
||||||
|
|
|
@ -27,7 +27,7 @@ use util::ppaux::{Repr};
|
||||||
use std::cell::{Cell, RefCell};
|
use std::cell::{Cell, RefCell};
|
||||||
use std::uint;
|
use std::uint;
|
||||||
use std::slice;
|
use std::slice;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use collections::{HashMap, HashSet};
|
use collections::{HashMap, HashSet};
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::opt_vec;
|
use syntax::opt_vec;
|
||||||
|
|
|
@ -58,7 +58,7 @@ use middle::typeck::infer::unify::{Root, UnifyInferCtxtMethods};
|
||||||
use util::common::{indent, indenter};
|
use util::common::{indent, indenter};
|
||||||
use util::ppaux::ty_to_str;
|
use util::ppaux::ty_to_str;
|
||||||
|
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
|
|
||||||
pub static resolve_nested_tvar: uint = 0b0000000001;
|
pub static resolve_nested_tvar: uint = 0b0000000001;
|
||||||
|
|
|
@ -17,7 +17,7 @@ use middle::typeck::infer::{Bounds, uok, ures};
|
||||||
use middle::typeck::infer::InferCtxt;
|
use middle::typeck::infer::InferCtxt;
|
||||||
use middle::typeck::infer::to_str::InferStr;
|
use middle::typeck::infer::to_str::InferStr;
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
|
|
||||||
#[deriving(Clone)]
|
#[deriving(Clone)]
|
||||||
|
|
|
@ -72,7 +72,7 @@ use util::nodemap::{DefIdMap, FnvHashMap, NodeMap};
|
||||||
|
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use collections::List;
|
use collections::List;
|
||||||
use syntax::codemap::Span;
|
use syntax::codemap::Span;
|
||||||
use syntax::print::pprust::*;
|
use syntax::print::pprust::*;
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
use middle::ty;
|
use middle::ty;
|
||||||
|
|
||||||
use std::cell::Cell;
|
use std::cell::Cell;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::codemap::Span;
|
use syntax::codemap::Span;
|
||||||
use syntax::opt_vec::OptVec;
|
use syntax::opt_vec::OptVec;
|
||||||
|
|
|
@ -197,7 +197,7 @@ use arena;
|
||||||
use arena::Arena;
|
use arena::Arena;
|
||||||
use middle::ty;
|
use middle::ty;
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
use std::vec_ng::Vec;
|
use std::vec::Vec;
|
||||||
use syntax::ast;
|
use syntax::ast;
|
||||||
use syntax::ast_util;
|
use syntax::ast_util;
|
||||||
use syntax::opt_vec;
|
use syntax::opt_vec;
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue