---

yaml
---
r: 146257
b: refs/heads/try2
c: dba6070
h: refs/heads/master
i:
  146255: 4ba70c8
v: v3

Author: bors

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 17b87d20304db1e8727754b7ef900dc3c986d878
+refs/heads/try2: dba60700804119f7e953e6b2b72ce4875c9d60cb
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/mk/rt.mk

@@ -89,8 +89,6 @@ RUNTIME_CXXS_$(1)_$(2) := \
               rt/rust_upcall.cpp \
               rt/rust_uv.cpp \
               rt/miniz.cpp \
-              rt/memory_region.cpp \
-              rt/boxed_region.cpp \
               rt/rust_android_dummy.cpp \
               rt/rust_test_helpers.cpp
 

branches/try2/src/compiletest/runtest.rs

@@ -23,7 +23,7 @@ use util::logv;
 use std::cell::Cell;
 use std::rt::io;
 use std::rt::io::Writer;
-use std::rt::io::extensions::ReaderUtil;
+use std::rt::io::Reader;
 use std::rt::io::file::FileInfo;
 use std::os;
 use std::str;

branches/try2/src/libextra/json.rs

@@ -22,7 +22,6 @@ use std::f64;
 use std::hashmap::HashMap;
 use std::rt::io;
 use std::rt::io::Decorator;
-use std::rt::io::extensions::ReaderUtil;
 use std::rt::io::mem::MemWriter;
 use std::num;
 use std::str;
@@ -843,7 +842,7 @@ impl<T : Iterator<char>> Parser<T> {
 }
 
 /// Decodes a json value from an `&mut io::Reader`
-pub fn from_reader(mut rdr: &mut io::Reader) -> Result<Json, Error> {
+pub fn from_reader(rdr: &mut io::Reader) -> Result<Json, Error> {
     let s = str::from_utf8(rdr.read_to_end());
     let mut parser = Parser(~s.iter());
     parser.parse()

branches/try2/src/libextra/sync.rs

@@ -918,7 +918,7 @@ mod tests {
         let m = Mutex::new();
         let m2 = m.clone();
 
-        let result: result::Result<(),()> = do task::try {
+        let result: result::Result<(), ~Any> = do task::try {
             do m2.lock {
                 fail!();
             }
@@ -935,7 +935,7 @@ mod tests {
         let m = Mutex::new();
         let m2 = m.clone();
 
-        let result: result::Result<(),()> = do task::try {
+        let result: result::Result<(), ~Any> = do task::try {
             let (p, c) = comm::stream();
             do task::spawn || { // linked
                 let _ = p.recv(); // wait for sibling to get in the mutex
@@ -963,7 +963,7 @@ mod tests {
         let m2 = m.clone();
         let (p, c) = comm::stream();
 
-        let result: result::Result<(),()> = do task::try {
+        let result: result::Result<(), ~Any> = do task::try {
             let mut sibling_convos = ~[];
             do 2.times {
                 let (p, c) = comm::stream();
@@ -1272,7 +1272,7 @@ mod tests {
         let x = RWLock::new();
         let x2 = x.clone();
 
-        let result: result::Result<(),()> = do task::try || {
+        let result: result::Result<(), ~Any> = do task::try || {
             do lock_rwlock_in_mode(&x2, mode1) {
                 fail!();
             }

branches/try2/src/libextra/terminfo/parser/compiled.rs

@@ -16,7 +16,6 @@
 use std::{vec, str};
 use std::hashmap::HashMap;
 use std::rt::io;
-use std::rt::io::extensions::{ReaderByteConversions, ReaderUtil};
 use super::super::TermInfo;
 
 // These are the orders ncurses uses in its compiled format (as of 5.9). Not sure if portable.
@@ -161,7 +160,7 @@ pub static stringnames: &'static[&'static str] = &'static[ "cbt", "_", "cr", "cs
     "box1"];
 
 /// Parse a compiled terminfo entry, using long capability names if `longnames` is true
-pub fn parse(mut file: &mut io::Reader,
+pub fn parse(file: &mut io::Reader,
              longnames: bool) -> Result<~TermInfo, ~str> {
     let bnames;
     let snames;
@@ -178,17 +177,17 @@ pub fn parse(mut file: &mut io::Reader,
     }
 
     // Check magic number
-    let magic = file.read_le_u16_();
+    let magic = file.read_le_u16();
     if (magic != 0x011A) {
         return Err(format!("invalid magic number: expected {:x} but found {:x}",
                            0x011A, magic as uint));
     }
 
-    let names_bytes          = file.read_le_i16_() as int;
-    let bools_bytes          = file.read_le_i16_() as int;
-    let numbers_count        = file.read_le_i16_() as int;
-    let string_offsets_count = file.read_le_i16_() as int;
-    let string_table_bytes   = file.read_le_i16_() as int;
+    let names_bytes          = file.read_le_i16() as int;
+    let bools_bytes          = file.read_le_i16() as int;
+    let numbers_count        = file.read_le_i16() as int;
+    let string_offsets_count = file.read_le_i16() as int;
+    let string_table_bytes   = file.read_le_i16() as int;
 
     assert!(names_bytes          > 0);
 
@@ -247,7 +246,7 @@ pub fn parse(mut file: &mut io::Reader,
     let mut numbers_map = HashMap::new();
     if numbers_count != 0 {
         for i in range(0, numbers_count) {
-            let n = file.read_le_u16_();
+            let n = file.read_le_u16();
             if n != 0xFFFF {
                 debug!("{}\\#{}", nnames[i], n);
                 numbers_map.insert(nnames[i].to_owned(), n);
@@ -262,7 +261,7 @@ pub fn parse(mut file: &mut io::Reader,
     if string_offsets_count != 0 {
         let mut string_offsets = vec::with_capacity(10);
         for _ in range(0, string_offsets_count) {
-            string_offsets.push(file.read_le_u16_());
+            string_offsets.push(file.read_le_u16());
         }
 
         debug!("offsets: {:?}", string_offsets);

branches/try2/src/libextra/test.rs

@@ -873,8 +873,7 @@ pub fn run_test(force_ignore: bool,
             task.spawn(testfn_cell.take());
 
             let task_result = result_future.recv();
-            let test_result = calc_result(&desc,
-                                          task_result == task::Success);
+            let test_result = calc_result(&desc, task_result.is_ok());
             monitor_ch.send((desc.clone(), test_result));
         }
     }

branches/try2/src/libextra/workcache.rs

@@ -20,6 +20,7 @@ use std::comm::{PortOne, oneshot};
 use std::{os, str, task};
 use std::rt::io;
 use std::rt::io::Writer;
+use std::rt::io::Reader;
 use std::rt::io::Decorator;
 use std::rt::io::mem::MemWriter;
 use std::rt::io::file::FileInfo;
@@ -481,7 +482,7 @@ impl<'self, T:Send +
 #[test]
 fn test() {
     use std::{os, run};
-    use std::rt::io::ReaderUtil;
+    use std::rt::io::Reader;
     use std::str::from_utf8_owned;
 
     // Create a path to a new file 'filename' in the directory in which

branches/try2/src/librustc/driver/driver.rs

@@ -757,7 +757,9 @@ pub fn build_session_options(binary: @str,
 
     let statik = debugging_opts & session::statik != 0;
 
-    let addl_lib_search_paths = matches.opt_strs("L").map(|s| Path::new(s.as_slice()));
+    let addl_lib_search_paths = matches.opt_strs("L").map(|s| {
+      Path::new(s.as_slice())
+    }).move_iter().collect();
     let linker = matches.opt_str("linker");
     let linker_args = matches.opt_strs("link-args").flat_map( |a| {
         a.split_iter(' ').map(|arg| arg.to_owned()).collect()

branches/try2/src/librustc/driver/session.rs

@@ -29,7 +29,7 @@ use syntax::parse::token;
 use syntax;
 
 use std::int;
-use std::hashmap::HashMap;
+use std::hashmap::{HashMap,HashSet};
 
 #[deriving(Eq)]
 pub enum Os { OsWin32, OsMacos, OsLinux, OsAndroid, OsFreebsd, }
@@ -158,9 +158,9 @@ pub struct options {
     save_temps: bool,
     jit: bool,
     output_type: back::link::output_type,
-    addl_lib_search_paths: @mut ~[Path], // This is mutable for rustpkg, which
-                                         // updates search paths based on the
-                                         // parsed code
+    addl_lib_search_paths: @mut HashSet<Path>, // This is mutable for rustpkg, which
+                                               // updates search paths based on the
+                                               // parsed code
     linker: Option<~str>,
     linker_args: ~[~str],
     maybe_sysroot: Option<@Path>,
@@ -366,7 +366,7 @@ pub fn basic_options() -> @options {
         save_temps: false,
         jit: false,
         output_type: link::output_type_exe,
-        addl_lib_search_paths: @mut ~[],
+        addl_lib_search_paths: @mut HashSet::new(),
         linker: None,
         linker_args: ~[],
         maybe_sysroot: None,

branches/try2/src/librustc/metadata/encoder.rs

@@ -22,7 +22,6 @@ use middle::typeck;
 use middle;
 
 use std::hashmap::{HashMap, HashSet};
-use std::rt::io::extensions::WriterByteConversions;
 use std::rt::io::{Writer, Seek, Decorator};
 use std::rt::io::mem::MemWriter;
 use std::str;
@@ -894,11 +893,11 @@ fn encode_info_for_item(ecx: &EncodeContext,
                         vis: ast::visibility) {
     let tcx = ecx.tcx;
 
-    fn add_to_index_(item: @item, ebml_w: &writer::Encoder,
+    fn add_to_index(item: @item, ebml_w: &writer::Encoder,
                      index: @mut ~[entry<i64>]) {
         index.push(entry { val: item.id as i64, pos: ebml_w.writer.tell() });
     }
-    let add_to_index: &fn() = || add_to_index_(item, ebml_w, index);
+    let add_to_index: &fn() = || add_to_index(item, ebml_w, index);
 
     debug!("encoding info for item at {}",
            ecx.tcx.sess.codemap.span_to_str(item.span));
@@ -1411,7 +1410,7 @@ fn encode_index<T:'static>(
             assert!(elt.pos < 0xffff_ffff);
             {
                 let wr: &mut MemWriter = ebml_w.writer;
-                wr.write_be_u32_(elt.pos as u32);
+                wr.write_be_u32(elt.pos as u32);
             }
             write_fn(ebml_w.writer, &elt.val);
             ebml_w.end_tag();
@@ -1423,7 +1422,7 @@ fn encode_index<T:'static>(
     for pos in bucket_locs.iter() {
         assert!(*pos < 0xffff_ffff);
         let wr: &mut MemWriter = ebml_w.writer;
-        wr.write_be_u32_(*pos as u32);
+        wr.write_be_u32(*pos as u32);
     }
     ebml_w.end_tag();
     ebml_w.end_tag();
@@ -1436,7 +1435,7 @@ fn write_str(writer: @mut MemWriter, s: ~str) {
 fn write_i64(writer: @mut MemWriter, &n: &i64) {
     let wr: &mut MemWriter = writer;
     assert!(n < 0x7fff_ffff);
-    wr.write_be_u32_(n as u32);
+    wr.write_be_u32(n as u32);
 }
 
 fn encode_meta_item(ebml_w: &mut writer::Encoder, mi: @MetaItem) {
@@ -1591,14 +1590,14 @@ fn encode_lang_items(ecx: &EncodeContext, ebml_w: &mut writer::Encoder) {
                 ebml_w.start_tag(tag_lang_items_item_id);
                 {
                     let wr: &mut MemWriter = ebml_w.writer;
-                    wr.write_be_u32_(i as u32);
+                    wr.write_be_u32(i as u32);
                 }
                 ebml_w.end_tag();   // tag_lang_items_item_id
 
                 ebml_w.start_tag(tag_lang_items_item_node_id);
                 {
                     let wr: &mut MemWriter = ebml_w.writer;
-                    wr.write_be_u32_(id.node as u32);
+                    wr.write_be_u32(id.node as u32);
                 }
                 ebml_w.end_tag();   // tag_lang_items_item_node_id
 

branches/try2/src/librustc/metadata/filesearch.rs

@@ -40,11 +40,11 @@ pub trait FileSearch {
 
 pub fn mk_filesearch(maybe_sysroot: &Option<@Path>,
                      target_triple: &str,
-                     addl_lib_search_paths: @mut ~[Path])
+                     addl_lib_search_paths: @mut HashSet<Path>)
                   -> @FileSearch {
     struct FileSearchImpl {
         sysroot: @Path,
-        addl_lib_search_paths: @mut ~[Path],
+        addl_lib_search_paths: @mut HashSet<Path>,
         target_triple: ~str
     }
     impl FileSearch for FileSearchImpl {

branches/try2/src/librustc/middle/trans/base.rs

@@ -2844,6 +2844,8 @@ pub fn declare_intrinsics(llmod: ModuleRef) -> HashMap<&'static str, ValueRef> {
     ifn!(intrinsics, "llvm.umul.with.overflow.i64",
         [Type::i64(), Type::i64()], Type::struct_([Type::i64(), Type::i1()], false));
 
+    ifn!(intrinsics, "llvm.expect.i1", [Type::i1(), Type::i1()], Type::i1());
+
     return intrinsics;
 }
 

branches/try2/src/librustc/middle/trans/common.rs

@@ -70,6 +70,7 @@ pub fn type_is_immediate(ccx: &mut CrateContext, ty: ty::t) -> bool {
         return true;
     }
     match ty::get(ty).sty {
+        ty::ty_bot => true,
         ty::ty_struct(*) | ty::ty_enum(*) | ty::ty_tup(*) => {
             let llty = sizing_type_of(ccx, ty);
             llsize_of_alloc(ccx, llty) <= llsize_of_alloc(ccx, ccx.int_type)

branches/try2/src/librustc/middle/trans/expr.rs

@@ -981,7 +981,9 @@ fn trans_lvalue_unadjusted(bcx: @mut Block, expr: &ast::Expr) -> DatumBlock {
         debug!("trans_index: len {}", bcx.val_to_str(len));
 
         let bounds_check = ICmp(bcx, lib::llvm::IntUGE, ix_val, len);
-        let bcx = do with_cond(bcx, bounds_check) |bcx| {
+        let expect = ccx.intrinsics.get_copy(&("llvm.expect.i1"));
+        let expected = Call(bcx, expect, [bounds_check, C_i1(false)], []);
+        let bcx = do with_cond(bcx, expected) |bcx| {
             controlflow::trans_fail_bounds_check(bcx, index_expr.span, ix_val, len)
         };
         let elt = InBoundsGEP(bcx, base, [ix_val]);

branches/try2/src/librustc/rustc.rs

@@ -37,7 +37,7 @@ use middle::lint;
 
 use std::comm;
 use std::rt::io;
-use std::rt::io::extensions::ReaderUtil;
+use std::rt::io::Reader;
 use std::num;
 use std::os;
 use std::result;

branches/try2/src/librustdoc/core.rs

@@ -20,7 +20,7 @@ use syntax;
 
 use std::os;
 use std::local_data;
-use std::hashmap::HashMap;
+use std::hashmap::{HashMap,HashSet};
 
 use visit_ast::RustdocVisitor;
 use clean;
@@ -39,7 +39,7 @@ pub struct CrateAnalysis {
 
 /// Parses, resolves, and typechecks the given crate
 fn get_ast_and_resolve(cpath: &Path,
-                       libs: ~[Path]) -> (DocContext, CrateAnalysis) {
+                       libs: HashSet<Path>) -> (DocContext, CrateAnalysis) {
     use syntax::codemap::dummy_spanned;
     use rustc::driver::driver::{file_input, build_configuration,
                                 phase_1_parse_input,
@@ -89,7 +89,7 @@ fn get_ast_and_resolve(cpath: &Path,
             CrateAnalysis { reexports: reexports, exported_items: exported_items });
 }
 
-pub fn run_core (libs: ~[Path], path: &Path) -> (clean::Crate, CrateAnalysis) {
+pub fn run_core (libs: HashSet<Path>, path: &Path) -> (clean::Crate, CrateAnalysis) {
     let (ctxt, analysis) = get_ast_and_resolve(path, libs);
     let ctxt = @ctxt;
     debug!("defmap:");

branches/try2/src/librustdoc/rustdoc.rs

@@ -198,7 +198,7 @@ fn rust_input(cratefile: &str, matches: &getopts::Matches) -> Output {
     info!("starting to run rustc");
     let (crate, analysis) = do std::task::try {
         let cr = cr.take();
-        core::run_core(libs.take(), &cr)
+        core::run_core(libs.take().move_iter().collect(), &cr)
     }.unwrap();
     info!("finished with rustc");
     local_data::set(analysiskey, analysis);