---

yaml
---
r: 139817
b: refs/heads/try2
c: 7cd6816
h: refs/heads/master
i:
  139815: 13c0309
v: v3

Author: brson

[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: 68dea752967fa2c7e0c4b82f476086457c93fff7
+refs/heads/try2: 7cd681684f96c0f59468346384f6f5c5a04a7ff5
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/AUTHORS.txt

@@ -31,7 +31,6 @@ Bilal Husain <[email protected]>
 Bill Fallon <[email protected]>
 Brendan Eich <[email protected]>
 Brendan Zabarauskas <[email protected]>
-Brett Cannon <[email protected]>
 Brian Anderson <[email protected]>
 Brian J. Burg <[email protected]>
 Brian Leibig <[email protected]>
@@ -51,7 +50,6 @@ Dave Herman <[email protected]>
 David Forsythe <[email protected]>
 David Klein <[email protected]>
 David Rajchenbach-Teller <[email protected]>
-Diggory Hardy <[email protected]>
 Dimitri Krassovski <[email protected]>
 Donovan Preston <[email protected]>
 Drew Willcoxon <[email protected]>
@@ -78,11 +76,9 @@ Ian D. Bollinger <[email protected]>
 Ilyong Cho <[email protected]>
 Isaac Aggrey <[email protected]>
 Ivano Coppola <[email protected]>
-Jack Moffitt <[email protected]>
 Jacob Harris Cryer Kragh <[email protected]>
 Jacob Parker <[email protected]>
 Jakub Wieczorek <[email protected]>
-James Miller <[email protected]>
 Jason Orendorff <[email protected]>
 Jed Davis <[email protected]>
 Jeff Balogh <[email protected]>

branches/try2/RELEASES.txt

@@ -1,17 +1,5 @@
-Version 0.7 (July 2013)
------------------------
-
-   * ??? changes, numerous bugfixes
-
-   * Semantic changes
-      * The `self` parameter no longer implicitly means `&'self self`, and can be explicitly marked
-        with a lifetime.
-
-   * Libraries
-      * New `core::iterator` module for external iterator objects
-
 Version 0.6 (April 2013)
-------------------------
+---------------------------
 
    * ~2100 changes, numerous bugfixes
 

branches/try2/mk/rt.mk

@@ -76,7 +76,8 @@ RUNTIME_CXXS_$(1) := \
               rt/boxed_region.cpp \
               rt/arch/$$(HOST_$(1))/context.cpp \
               rt/arch/$$(HOST_$(1))/gpr.cpp \
-              rt/rust_android_dummy.cpp
+              rt/rust_android_dummy.cpp \
+              rt/rust_test_helpers.cpp
 
 RUNTIME_CS_$(1) := rt/linenoise/linenoise.c rt/linenoise/utf8.c
 

branches/try2/src/compiletest/errors.rs

@@ -30,34 +30,36 @@ pub fn load_errors(testfile: &Path) -> ~[ExpectedError] {
 }
 
 fn parse_expected(line_num: uint, line: ~str) -> ~[ExpectedError] {
-    let error_tag = ~"//~";
-    let mut idx;
-    match str::find_str(line, error_tag) {
-      None => return ~[],
-      Some(nn) => { idx = (nn as uint) + str::len(error_tag); }
-    }
+    unsafe {
+        let error_tag = ~"//~";
+        let mut idx;
+        match str::find_str(line, error_tag) {
+          None => return ~[],
+          Some(nn) => { idx = (nn as uint) + str::len(error_tag); }
+        }
 
-    // "//~^^^ kind msg" denotes a message expected
-    // three lines above current line:
-    let mut adjust_line = 0u;
-    let len = str::len(line);
-    while idx < len && line[idx] == ('^' as u8) {
-        adjust_line += 1u;
-        idx += 1u;
-    }
+        // "//~^^^ kind msg" denotes a message expected
+        // three lines above current line:
+        let mut adjust_line = 0u;
+        let len = str::len(line);
+        while idx < len && line[idx] == ('^' as u8) {
+            adjust_line += 1u;
+            idx += 1u;
+        }
 
-    // Extract kind:
-    while idx < len && line[idx] == (' ' as u8) { idx += 1u; }
-    let start_kind = idx;
-    while idx < len && line[idx] != (' ' as u8) { idx += 1u; }
-    let kind = str::to_lower(str::slice(line, start_kind, idx).to_owned());
+        // Extract kind:
+        while idx < len && line[idx] == (' ' as u8) { idx += 1u; }
+        let start_kind = idx;
+        while idx < len && line[idx] != (' ' as u8) { idx += 1u; }
+        let kind = str::to_lower(str::slice(line, start_kind, idx).to_owned());
 
-    // Extract msg:
-    while idx < len && line[idx] == (' ' as u8) { idx += 1u; }
-    let msg = str::slice(line, idx, len).to_owned();
+        // Extract msg:
+        while idx < len && line[idx] == (' ' as u8) { idx += 1u; }
+        let msg = str::slice(line, idx, len).to_owned();
 
-    debug!("line=%u kind=%s msg=%s", line_num - adjust_line, kind, msg);
+        debug!("line=%u kind=%s msg=%s", line_num - adjust_line, kind, msg);
 
-    return ~[ExpectedError{line: line_num - adjust_line, kind: kind,
-                           msg: msg}];
+        return ~[ExpectedError{line: line_num - adjust_line, kind: kind,
+                               msg: msg}];
+    }
 }

branches/try2/src/compiletest/header.rs

@@ -171,14 +171,16 @@ fn parse_name_directive(line: ~str, directive: ~str) -> bool {
 
 fn parse_name_value_directive(line: ~str,
                               directive: ~str) -> Option<~str> {
-    let keycolon = directive + ~":";
-    match str::find_str(line, keycolon) {
-        Some(colon) => {
-            let value = str::slice(line, colon + str::len(keycolon),
-                                   str::len(line)).to_owned();
-            debug!("%s: %s", directive,  value);
-            Some(value)
+    unsafe {
+        let keycolon = directive + ~":";
+        match str::find_str(line, keycolon) {
+            Some(colon) => {
+                let value = str::slice(line, colon + str::len(keycolon),
+                                       str::len(line)).to_owned();
+                debug!("%s: %s", directive,  value);
+                Some(value)
+            }
+            None => None
         }
-        None => None
     }
 }

branches/try2/src/etc/x86.supp

@@ -612,6 +612,7 @@
    llvm-optimization-reads-uninitialized-memory-9
    Memcheck:Cond
    fun:_ZN5parse6parser14__extensions__10meth_*parse_item_foreign_fn*
+   fun:_ZN5parse6parser14__extensions__10meth_*parse_item_or_view_item*
    ...
 }
 
@@ -627,13 +628,15 @@
    llvm-optimization-reads-uninitialized-memory-12
    Memcheck:Cond
    fun:_ZN5parse6parser14__extensions__10meth_*parse_item_struct*
+   fun:_ZN5parse6parser14__extensions__10meth_*parse_item_or_view_item*
    ...
 }
 
 {
    llvm-optimization-reads-uninitialized-memory-13
    Memcheck:Cond
    fun:_ZN5parse6parser14__extensions__10meth_*parse_item_type*
+   fun:_ZN5parse6parser14__extensions__10meth_*parse_item_or_view_item*
    ...
 }
 
@@ -654,11 +657,3 @@
    fun:_ZN5visit30visit_struct_dtor_helper_*
    ...
 }
-
-{
-   llvm-optimization-reads-uninitialized-memory-16
-   Memcheck:Cond
-   fun:_ZN7ast_map6map_fn*
-   fun:_ZN5visit30visit_struct_dtor_helper*
-   ...
-}

branches/try2/src/libcore/at_vec.rs

@@ -277,49 +277,45 @@ pub mod raw {
     pub unsafe fn reserve_at_least<T>(v: &mut @[T], n: uint) {
         reserve(v, uint::next_power_of_two(n));
     }
+
 }
 
-#[cfg(test)]
-mod test {
-    use super::*;
-    use prelude::*;
-
-    #[test]
-    fn test() {
-        // Some code that could use that, then:
-        fn seq_range(lo: uint, hi: uint) -> @[uint] {
-            do build |push| {
-                for uint::range(lo, hi) |i| {
-                    push(i);
-                }
+#[test]
+pub fn test() {
+    // Some code that could use that, then:
+    fn seq_range(lo: uint, hi: uint) -> @[uint] {
+        do build |push| {
+            for uint::range(lo, hi) |i| {
+                push(i);
             }
         }
-
-        assert_eq!(seq_range(10, 15), @[10, 11, 12, 13, 14]);
-        assert!(from_fn(5, |x| x+1) == @[1, 2, 3, 4, 5]);
-        assert!(from_elem(5, 3.14) == @[3.14, 3.14, 3.14, 3.14, 3.14]);
     }
 
-    #[test]
-    fn append_test() {
-        assert!(@[1,2,3] + @[4,5,6] == @[1,2,3,4,5,6]);
-    }
+    assert_eq!(seq_range(10, 15), @[10, 11, 12, 13, 14]);
+    assert!(from_fn(5, |x| x+1) == @[1, 2, 3, 4, 5]);
+    assert!(from_elem(5, 3.14) == @[3.14, 3.14, 3.14, 3.14, 3.14]);
+}
 
-    #[test]
-    fn test_from_owned() {
-        assert!(from_owned::<int>(~[]) == @[]);
-        assert!(from_owned(~[true]) == @[true]);
-        assert!(from_owned(~[1, 2, 3, 4, 5]) == @[1, 2, 3, 4, 5]);
-        assert!(from_owned(~[~"abc", ~"123"]) == @[~"abc", ~"123"]);
-        assert!(from_owned(~[~[42]]) == @[~[42]]);
-    }
+#[test]
+pub fn append_test() {
+    assert!(@[1,2,3] + @[4,5,6] == @[1,2,3,4,5,6]);
+}
+
+#[test]
+pub fn test_from_owned() {
+    assert!(from_owned::<int>(~[]) == @[]);
+    assert!(from_owned(~[true]) == @[true]);
+    assert!(from_owned(~[1, 2, 3, 4, 5]) == @[1, 2, 3, 4, 5]);
+    assert!(from_owned(~[~"abc", ~"123"]) == @[~"abc", ~"123"]);
+    assert!(from_owned(~[~[42]]) == @[~[42]]);
+}
+
+#[test]
+pub fn test_from_slice() {
+    assert!(from_slice::<int>([]) == @[]);
+    assert!(from_slice([true]) == @[true]);
+    assert!(from_slice([1, 2, 3, 4, 5]) == @[1, 2, 3, 4, 5]);
+    assert!(from_slice([@"abc", @"123"]) == @[@"abc", @"123"]);
+    assert!(from_slice([@[42]]) == @[@[42]]);
+}
 
-    #[test]
-    fn test_from_slice() {
-        assert!(from_slice::<int>([]) == @[]);
-        assert!(from_slice([true]) == @[true]);
-        assert!(from_slice([1, 2, 3, 4, 5]) == @[1, 2, 3, 4, 5]);
-        assert!(from_slice([@"abc", @"123"]) == @[@"abc", @"123"]);
-        assert!(from_slice([@[42]]) == @[@[42]]);
-    }
-}

branches/try2/src/libcore/cast.rs

@@ -111,16 +111,16 @@ pub unsafe fn copy_lifetime_vec<'a,S,T>(_ptr: &'a [S], ptr: &T) -> &'a T {
  ****************************************************************************/
 
 #[cfg(test)]
-mod tests {
+pub mod tests {
     use cast::{bump_box_refcount, reinterpret_cast, transmute};
 
     #[test]
-    fn test_reinterpret_cast() {
+    pub fn test_reinterpret_cast() {
         assert!(1u == unsafe { reinterpret_cast(&1) });
     }
 
     #[test]
-    fn test_bump_box_refcount() {
+    pub fn test_bump_box_refcount() {
         unsafe {
             let box = @~"box box box";       // refcount 1
             bump_box_refcount(box);         // refcount 2
@@ -135,7 +135,7 @@ mod tests {
     }
 
     #[test]
-    fn test_transmute() {
+    pub fn test_transmute() {
         use managed::raw::BoxRepr;
         unsafe {
             let x = @100u8;
@@ -146,7 +146,7 @@ mod tests {
     }
 
     #[test]
-    fn test_transmute2() {
+    pub fn test_transmute2() {
         unsafe {
             assert!(~[76u8, 0u8] == transmute(~"L"));
         }

branches/try2/src/libcore/comm.rs

@@ -188,14 +188,16 @@ impl<T: Owned> Peekable<T> for Port<T> {
 
 #[inline(always)]
 fn port_peek<T:Owned>(self: &Port<T>) -> bool {
-    let mut endp = None;
-    endp <-> self.endp;
-    let peek = match &endp {
-        &Some(ref endp) => peek(endp),
-        &None => fail!(~"peeking empty stream")
-    };
-    self.endp <-> endp;
-    peek
+    unsafe {
+        let mut endp = None;
+        endp <-> self.endp;
+        let peek = match &endp {
+            &Some(ref endp) => peek(endp),
+            &None => fail!(~"peeking empty stream")
+        };
+        self.endp <-> endp;
+        peek
+    }
 }
 
 impl<T: Owned> Selectable for Port<T> {
@@ -426,12 +428,12 @@ pub fn try_send_one<T: Owned>(chan: ChanOne<T>, data: T)
 }
 
 #[cfg(test)]
-mod test {
+pub mod test {
     use either::Right;
     use super::{Chan, Port, oneshot, recv_one, stream};
 
     #[test]
-    fn test_select2() {
+    pub fn test_select2() {
         let (p1, c1) = stream();
         let (p2, c2) = stream();
 
@@ -446,7 +448,7 @@ mod test {
     }
 
     #[test]
-    fn test_oneshot() {
+    pub fn test_oneshot() {
         let (c, p) = oneshot::init();
 
         oneshot::client::send(c, ());