Merge branch 'incoming' into removing

Author: catamorphism

configure

@@ -515,7 +515,7 @@ then
  | cut -d ' ' -f 2)
 
  case $CFG_CLANG_VERSION in
- (3.0svn | 3.0 | 3.1* | 3.2* | 4.0* | 4.1*)
+ (3.0svn | 3.0 | 3.1* | 3.2* | 4.0* | 4.1* | 4.2*)
  step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
  CFG_C_COMPILER="clang"
  ;;

src/libcargo/cargo.rc

@@ -731,7 +731,7 @@ pub fn configure(opts: Options) -> Cargo {
  need_dir(&c.bindir);
 
  for sources.each_key_ref |&k| {
- let mut s = sources.get(k);
+ let mut s = sources.get(&k);
  load_source_packages(&c, s);
  sources.insert(k, s);
  }
@@ -981,7 +981,7 @@ pub fn install_named(c: &mut Cargo, wd: &Path, name: ~str) {
 
 pub fn install_uuid_specific(c: &mut Cargo, wd: &Path, src: ~str,
  uuid: ~str) {
- match c.sources.find(src) {
+ match c.sources.find(&src) {
  Some(s) => {
  for s.packages.each |p| {
  if p.uuid == uuid {
@@ -997,7 +997,7 @@ pub fn install_uuid_specific(c: &mut Cargo, wd: &Path, src: ~str,
 
 pub fn install_named_specific(c: &mut Cargo, wd: &Path, src: ~str,
  name: ~str) {
- match c.sources.find(src) {
+ match c.sources.find(&src) {
  Some(s) => {
  for s.packages.each |p| {
  if p.name == name {
@@ -1064,7 +1064,7 @@ pub fn cmd_uninstall(c: &Cargo) {
 }
 
 pub fn install_query(c: &mut Cargo, wd: &Path, target: ~str) {
- match c.dep_cache.find(target) {
+ match c.dep_cache.find(&target) {
  Some(inst) => {
  if inst {
  return;
@@ -1156,7 +1156,7 @@ pub fn cmd_install(c: &mut Cargo) {
 
 pub fn sync(c: &Cargo) {
  for c.sources.each_key_ref |&k| {
- let mut s = c.sources.get(k);
+ let mut s = c.sources.get(&k);
  sync_one(c, s);
  c.sources.insert(k, s);
  }
@@ -1558,7 +1558,7 @@ pub fn cmd_list(c: &Cargo) {
  if !valid_pkg_name(*name) {
  error(fmt!("'%s' is an invalid source name", *name));
  } else {
- match c.sources.find(*name) {
+ match c.sources.find(name) {
  Some(source) => {
  print_source(source);
  }
@@ -1754,7 +1754,7 @@ pub fn cmd_sources(c: &Cargo) {
  return;
  }
 
- match c.sources.find(name) {
+ match c.sources.find(&name) {
  Some(source) => {
  let old = copy source.url;
  let method = assume_source_method(url);
@@ -1785,7 +1785,7 @@ pub fn cmd_sources(c: &Cargo) {
  return;
  }
 
- match c.sources.find(name) {
+ match c.sources.find(&name) {
  Some(source) => {
  let old = copy source.method;
 
@@ -1823,7 +1823,7 @@ pub fn cmd_sources(c: &Cargo) {
  return;
  }
 
- match c.sources.find(name) {
+ match c.sources.find(&name) {
  Some(source) => {
  c.sources.remove(&name);
  c.sources.insert(newn, source);

src/libcore/either.rs

@@ -150,6 +150,23 @@ pub pure fn unwrap_right<T,U>(eith: Either<T,U>) -> U {
 }
 
 impl<T, U> Either<T, U> {
+ #[inline(always)]
+ fn either<V>(&self, f_left: fn(&T) -> V, f_right: fn(&U) -> V) -> V {
+ either(f_left, f_right, self)
+ }
+
+ #[inline(always)]
+ fn flip(self) -> Either<U, T> { flip(self) }
+
+ #[inline(always)]
+ fn to_result(self) -> Result<U, T> { to_result(self) }
+
+ #[inline(always)]
+ fn is_left(&self) -> bool { is_left(self) }
+
+ #[inline(always)]
+ fn is_right(&self) -> bool { is_right(self) }
+
  #[inline(always)]
  fn unwrap_left(self) -> T { unwrap_left(self) }
 

src/libcore/io.rs

@@ -490,25 +490,25 @@ pub fn FILERes(f: *libc::FILE) -> FILERes {
  }
 }
 
-pub fn FILE_reader(f: *libc::FILE, cleanup: bool) -> Reader {
+pub fn FILE_reader(f: *libc::FILE, cleanup: bool) -> @Reader {
  if cleanup {
- Wrapper { base: f, cleanup: FILERes(f) } as Reader
+ @Wrapper { base: f, cleanup: FILERes(f) } as @Reader
  } else {
- f as Reader
+ @f as @Reader
  }
 }
 
 // FIXME (#2004): this should either be an trait-less impl, a set of
 // top-level functions that take a reader, or a set of default methods on
 // reader (which can then be called reader)
 
-pub fn stdin() -> Reader {
+pub fn stdin() -> @Reader {
  unsafe {
- rustrt::rust_get_stdin() as Reader
+ rustrt::rust_get_stdin() as @Reader
  }
 }
 
-pub fn file_reader(path: &Path) -> Result<Reader, ~str> {
+pub fn file_reader(path: &Path) -> Result<@Reader, ~str> {
  unsafe {
  let f = os::as_c_charp(path.to_str(), |pathbuf| {
  os::as_c_charp("r", |modebuf|
@@ -555,11 +555,11 @@ impl BytesReader: Reader {
  fn tell(&self) -> uint { self.pos }
 }
 
-pub pure fn with_bytes_reader<t>(bytes: &[u8], f: fn(Reader) -> t) -> t {
- f(BytesReader { bytes: bytes, pos: 0u } as Reader)
+pub pure fn with_bytes_reader<t>(bytes: &[u8], f: fn(@Reader) -> t) -> t {
+ f(@BytesReader { bytes: bytes, pos: 0u } as @Reader)
 }
 
-pub pure fn with_str_reader<T>(s: &str, f: fn(Reader) -> T) -> T {
+pub pure fn with_str_reader<T>(s: &str, f: fn(@Reader) -> T) -> T {
  str::byte_slice(s, |bytes| with_bytes_reader(bytes, f))
 }
 

src/libcore/prelude.rs

@@ -12,40 +12,37 @@
 
 /* Reexported core operators */
 
+pub use either::{Either, Left, Right};
 pub use kinds::{Const, Copy, Owned, Durable};
-pub use ops::{Drop};
 pub use ops::{Add, Sub, Mul, Div, Modulo, Neg, Not};
 pub use ops::{BitAnd, BitOr, BitXor};
+pub use ops::{Drop};
 pub use ops::{Shl, Shr, Index};
 pub use option::{Option, Some, None};
 pub use result::{Result, Ok, Err};
 
 /* Reexported types and traits */
 
-pub use path::Path;
+pub use clone::Clone;
+pub use cmp::{Eq, Ord};
+pub use container::{Container, Mutable, Map, Set};
+pub use hash::Hash;
+pub use iter::{BaseIter, ExtendedIter, EqIter, CopyableIter};
+pub use iter::{CopyableOrderedIter, CopyableNonstrictIter, Times};
+pub use num::Num;
 pub use path::GenericPath;
-pub use path::WindowsPath;
+pub use path::Path;
 pub use path::PosixPath;
-
-pub use tuple::{CopyableTuple, ImmutableTuple, ExtendedTupleOps};
+pub use path::WindowsPath;
+pub use pipes::{GenericChan, GenericPort};
+pub use ptr::Ptr;
 pub use str::{StrSlice, Trimmable};
-pub use container::{Container, Mutable};
+pub use to_bytes::IterBytes;
+pub use to_str::ToStr;
+pub use tuple::{CopyableTuple, ImmutableTuple, ExtendedTupleOps};
 pub use vec::{CopyableVector, ImmutableVector};
 pub use vec::{ImmutableEqVector, ImmutableCopyableVector};
 pub use vec::{OwnedVector, OwnedCopyableVector};
-pub use iter::{BaseIter, ExtendedIter, EqIter, CopyableIter};
-pub use iter::{CopyableOrderedIter, CopyableNonstrictIter, Times};
-pub use container::{Container, Mutable, Map, Set};
-pub use pipes::{GenericChan, GenericPort};
-
-pub use num::Num;
-pub use ptr::Ptr;
-pub use to_str::ToStr;
-pub use clone::Clone;
-
-pub use cmp::{Eq, Ord};
-pub use hash::Hash;
-pub use to_bytes::IterBytes;
 
 /* Reexported modules */
 

src/libcore/private.rs

@@ -486,7 +486,7 @@ pub mod tests {
  res.recv();
  }
 
- #[test] #[should_fail] #[ignore(cfg(windows))]
+ #[test] #[should_fail] #[ignore(reason = "random red")]
  pub fn exclusive_unwrap_conflict() {
  let x = exclusive(~~"hello");
  let x2 = ~mut Some(x.clone());

src/librustc/back/link.rs

@@ -596,7 +596,7 @@ pub fn symbol_hash(tcx: ty::ctxt, symbol_hasher: &hash::State, t: ty::t,
 }
 
 pub fn get_symbol_hash(ccx: @crate_ctxt, t: ty::t) -> @str {
- match ccx.type_hashcodes.find(t) {
+ match ccx.type_hashcodes.find(&t) {
  Some(h) => h,
  None => {
  let hash = symbol_hash(ccx.tcx, ccx.symbol_hasher, t, ccx.link_meta);

src/librustc/driver/driver.rs

@@ -538,7 +538,7 @@ pub fn build_session_options(+binary: ~str,
  getopts::opt_strs(matches, level_name));
  for flags.each |lint_name| {
  let lint_name = str::replace(*lint_name, ~"-", ~"_");
- match lint_dict.find(/*bad*/ copy lint_name) {
+ match lint_dict.find(&lint_name) {
  None => {
  early_error(demitter, fmt!("unknown %s flag: %s",
  level_name, lint_name));

src/librustc/lib/llvm.rs

@@ -1331,11 +1331,11 @@ pub fn associate_type(tn: type_names, s: @str, t: TypeRef) {
 }
 
 pub fn type_has_name(tn: type_names, t: TypeRef) -> Option<@str> {
- return tn.type_names.find(t);
+ return tn.type_names.find(&t);
 }
 
 pub fn name_has_type(tn: type_names, s: @str) -> Option<TypeRef> {
- return tn.named_types.find(s);
+ return tn.named_types.find(&s);
 }
 
 pub fn mk_type_names() -> type_names {

src/librustc/metadata/cstore.rs

@@ -74,7 +74,7 @@ pub fn mk_cstore(intr: @ident_interner) -> CStore {
 
 pub fn get_crate_data(cstore: CStore, cnum: ast::crate_num)
  -> crate_metadata {
- return p(cstore).metas.get(cnum);
+ return p(cstore).metas.get(&cnum);
 }
 
 pub fn get_crate_hash(cstore: CStore, cnum: ast::crate_num) -> ~str {
@@ -139,7 +139,7 @@ pub fn add_use_stmt_cnum(cstore: CStore, use_id: ast::node_id,
 
 pub fn find_use_stmt_cnum(cstore: CStore,
  use_id: ast::node_id) -> Option<ast::crate_num> {
- p(cstore).use_crate_map.find(use_id)
+ p(cstore).use_crate_map.find(&use_id)
 }
 
 // returns hashes of crates directly used by this crate. Hashes are