---

yaml
---
r: 46971
b: refs/heads/try
c: 20fd0c5
h: refs/heads/master
i:
  46969: 07a511c
  46967: 5e01573
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
-refs/heads/try: dcb98f4097240ade472aea8b33b19dd3ecb4fd51
+refs/heads/try: 20fd0c53edd2cc5ef5d413b8698b2c5860aa4926
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/etc/licenseck.py

@@ -8,7 +8,8 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-license0 = """// Copyright 2012-2013 The Rust Project Developers. See the
+license0 = """\
+// Copyright 2012-2013 The Rust Project Developers. See the
 // COPYRIGHT file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -19,7 +20,8 @@
 // except according to those terms.
 """
 
-license1 = """// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+license1 = """\
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -30,7 +32,8 @@
 // except according to those terms.
 """
 
-license2 = """// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+license2 = """\
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -41,7 +44,8 @@
 // except according to those terms.
 """
 
-license3 = """# Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+license3 = """\
+# Copyright 2013 The Rust Project Developers. See the COPYRIGHT
 # file at the top-level directory of this distribution and at
 # http://rust-lang.org/COPYRIGHT.
 #
@@ -52,7 +56,19 @@
 # except according to those terms.
 """
 
-licenses = [license0, license1, license2, license3]
+license4 = """\
+// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+"""
+
+licenses = [license0, license1, license2, license3, license4]
 
 exceptions = [
     "rt/rust_android_dummy.cpp", # BSD, chromium

branches/try/src/libcore/hashmap.rs

@@ -159,7 +159,7 @@ pub mod linear {
         pure fn value_for_bucket(&self, idx: uint) -> &self/V {
             match self.buckets[idx] {
                 Some(ref bkt) => &bkt.value,
-                None => die!(~"LinearMap::find: internal logic error"),
+                None => fail!(~"LinearMap::find: internal logic error"),
             }
         }
 
@@ -373,7 +373,7 @@ pub mod linear {
 
             let hash = k.hash_keyed(self.k0, self.k1) as uint;
             let idx = match self.bucket_for_key_with_hash(hash, &k) {
-                TableFull => die!(~"Internal logic error"),
+                TableFull => fail!(~"Internal logic error"),
                 FoundEntry(idx) => idx,
                 FoundHole(idx) => {
                     self.buckets[idx] = Some(Bucket{hash: hash, key: k,
@@ -403,7 +403,7 @@ pub mod linear {
 
             let hash = k.hash_keyed(self.k0, self.k1) as uint;
             let idx = match self.bucket_for_key_with_hash(hash, &k) {
-                TableFull => die!(~"Internal logic error"),
+                TableFull => fail!(~"Internal logic error"),
                 FoundEntry(idx) => idx,
                 FoundHole(idx) => {
                     let v = f(&k);

branches/try/src/libcore/os.rs

@@ -849,7 +849,7 @@ pub fn last_os_error() -> ~str {
             let err = strerror_r(errno() as c_int, &buf[0],
                                  TMPBUF_SZ as size_t);
             if err < 0 {
-                die!(~"strerror_r failure");
+                fail!(~"strerror_r failure");
             }
 
             str::raw::from_c_str(&buf[0])
@@ -887,7 +887,7 @@ pub fn last_os_error() -> ~str {
                                      &mut buf[0], TMPBUF_SZ as DWORD,
                                      ptr::null());
             if res == 0 {
-                die!(fmt!("[%?] FormatMessage failure", errno()));
+                fail!(fmt!("[%?] FormatMessage failure", errno()));
             }
 
             str::raw::from_c_str(&buf[0])

branches/try/src/libcore/private/exchange_alloc.rs

@@ -14,7 +14,7 @@ use c_malloc = libc::malloc;
 use c_free = libc::free;
 use managed::raw::{BoxHeaderRepr, BoxRepr};
 use cast::transmute;
-use ptr::{set_memory, null};
+use ptr::null;
 use intrinsic::TyDesc;
 
 pub unsafe fn malloc(td: *TypeDesc, size: uint) -> *c_void {
@@ -25,10 +25,6 @@ pub unsafe fn malloc(td: *TypeDesc, size: uint) -> *c_void {
         let p = c_malloc(total_size as size_t);
         assert p.is_not_null();
 
-        // FIXME #4761: Would be very nice to not memset all allocations
-        let p: *mut u8 = transmute(p);
-        set_memory(p, 0, total_size);
-
         // FIXME #3475: Converting between our two different tydesc types
         let td: *TyDesc = transmute(td);
 

branches/try/src/libcore/rt.rs

@@ -62,7 +62,7 @@ pub unsafe fn rt_fail_borrowed() {
     }
 }
 
-// FIXME #4942: Make these signatures agree with exchange_alloc's signatures
+// XXX: Make these signatures agree with exchange_alloc's signatures
 #[rt(exchange_malloc)]
 #[lang="exchange_malloc"]
 pub unsafe fn rt_exchange_malloc(td: *c_char, size: uintptr_t) -> *c_char {

branches/try/src/libcore/run.rs

@@ -250,7 +250,7 @@ pub fn start_program(prog: &str, args: &[~str]) -> Program {
         r: ProgRepr,
         drop {
             unsafe {
-                // FIXME #4943: This is bad.
+                // XXX: This is bad.
                 destroy_repr(cast::transmute(&self.r));
             }
         }

branches/try/src/librustc/middle/check_const.rs

@@ -16,7 +16,6 @@ use middle::ty;
 use middle::typeck;
 use util::ppaux;
 
-use core::dvec::DVec;
 use core::option;
 use std::oldmap::HashMap;
 use syntax::ast::*;
@@ -212,20 +211,20 @@ pub fn check_item_recursion(sess: Session,
                             ast_map: ast_map::map,
                             def_map: resolve::DefMap,
                             it: @item) {
-    type env = {
+    struct env {
         root_it: @item,
         sess: Session,
         ast_map: ast_map::map,
         def_map: resolve::DefMap,
-        idstack: @DVec<node_id>,
-    };
+        idstack: @mut ~[node_id]
+    }
 
-    let env = {
+    let env = env {
         root_it: it,
         sess: sess,
         ast_map: ast_map,
         def_map: def_map,
-        idstack: @DVec()
+        idstack: @mut ~[]
     };
 
     let visitor = visit::mk_vt(@visit::Visitor {
@@ -236,12 +235,12 @@ pub fn check_item_recursion(sess: Session,
     (visitor.visit_item)(it, env, visitor);
 
     fn visit_item(it: @item, &&env: env, v: visit::vt<env>) {
-        if (*env.idstack).contains(&(it.id)) {
+        if env.idstack.contains(&(it.id)) {
             env.sess.span_fatal(env.root_it.span, ~"recursive constant");
         }
-        (*env.idstack).push(it.id);
+        env.idstack.push(it.id);
         visit::visit_item(it, env, v);
-        (*env.idstack).pop();
+        env.idstack.pop();
     }
 
     fn visit_expr(e: @expr, &&env: env, v: visit::vt<env>) {

branches/try/src/libstd/json.rs

@@ -1284,21 +1284,21 @@ mod tests {
     // Should they be in their own crate?
     pub pure fn check_equal_ptr<T : cmp::Eq> (given : &T, expected: &T) {
         if !((given == expected) && (expected == given )) {
-            die!(fmt!("given %?, expected %?",given,expected));
+            fail!(fmt!("given %?, expected %?",given,expected));
         }
     }
 
     pub pure fn check_equal<T : cmp::Eq> (given : T, expected: T) {
         if !((given == expected) && (expected == given )) {
-            die!(fmt!("given %?, expected %?",given,expected));
+            fail!(fmt!("given %?, expected %?",given,expected));
         }
     }
 
     // testing both auto_encode's calling patterns
     // and json... not sure where to put these tests.
     #[test]
     fn test_write_enum () {
-        let bw = @io::BytesWriter {bytes: dvec::DVec(), pos: 0};
+        let bw = @io::BytesWriter();
         let bww : @io::Writer = (bw as @io::Writer);
         let encoder = (@Encoder(bww) as @serialize::Encoder);
         do encoder.emit_enum(~"animal") {
@@ -1319,7 +1319,7 @@ mod tests {
 
     #[test]
     fn test_write_some () {
-        let bw = @io::BytesWriter {bytes: dvec::DVec(), pos: 0};
+        let bw = @io::BytesWriter();
         let bww : @io::Writer = (bw as @io::Writer);
         let encoder = (@Encoder(bww) as @serialize::Encoder);
         do encoder.emit_enum(~"Option") {
@@ -1335,7 +1335,7 @@ mod tests {
 
     #[test]
     fn test_write_none () {
-        let bw = @io::BytesWriter {bytes: dvec::DVec(), pos: 0};
+        let bw = @io::BytesWriter();
         let bww : @io::Writer = (bw as @io::Writer);
         let encoder = (@Encoder(bww) as @serialize::Encoder);
         do encoder.emit_enum(~"Option") {

branches/try/src/libstd/test.rs

@@ -143,7 +143,7 @@ pub fn test_main_static(args: &[~str], tests: &[TestDescAndFn]) {
             TestDescAndFn { testfn: StaticBenchFn(f), desc: copy t.desc },
 
             _ => {
-                die! (~"non-static tests passed to test::test_main_static");
+                fail!(~"non-static tests passed to test::test_main_static");
             }
         }
     };

branches/try/src/libstd/uv_ll.rs

@@ -1253,7 +1253,7 @@ pub mod test {
                       as *request_wrapper;
                 let buf_base = get_base_from_buf(buf);
                 let buf_len = get_len_from_buf(buf);
-                let bytes = vec::from_buf(buf_base, buf_len as uint);
+                let bytes = vec::from_buf(buf_base, nread as uint);
                 let read_chan = (*client_data).read_chan.clone();
                 let msg_from_server = str::from_bytes(bytes);
                 read_chan.send(msg_from_server);
@@ -1445,15 +1445,15 @@ pub mod test {
                                 buf_base as uint,
                                 buf_len as uint,
                                 nread));
-                let bytes = vec::from_buf(buf_base, buf_len);
+                let bytes = vec::from_buf(buf_base, nread as uint);
                 let request_str = str::from_bytes(bytes);
 
                 let client_data = get_data_for_uv_handle(
                     client_stream_ptr as *libc::c_void) as *tcp_server_data;
 
                 let server_kill_msg = (*client_data).server_kill_msg;
                 let write_req = (*client_data).server_write_req;
-                if (str::contains(request_str, server_kill_msg)) {
+                if str::contains(request_str, server_kill_msg) {
                     log(debug, ~"SERVER: client req contains kill_msg!");
                     log(debug, ~"SERVER: sending response to client");
                     read_stop(client_stream_ptr);

branches/try/src/libstd/workcache.rs

@@ -16,7 +16,6 @@ use serialize::{Encoder, Encodable, Decoder, Decodable};
 use sort;
 
 use core::cmp;
-use core::dvec;
 use core::either::{Either, Left, Right};
 use core::io;
 use core::option;
@@ -141,13 +140,12 @@ type WorkMap = LinearMap<WorkKey, ~str>;
 
 pub impl<S: Encoder> WorkMap: Encodable<S> {
     fn encode(&self, s: &S) {
-        let d = dvec::DVec();
+        let mut d = ~[];
         for self.each |&(k, v)| {
             d.push((copy *k, copy *v))
         }
-        let mut v = d.get();
-        sort::tim_sort(v);
-        v.encode(s)
+        sort::tim_sort(d);
+        d.encode(s)
     }
 }