---

yaml
---
r: 62788
b: refs/heads/snap-stage3
c: 5676056
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 9ab2921300788b1f7a1f4fdd2c7b8148658f512c
+refs/heads/snap-stage3: 5676056ae6dd3a10d2c7323375ace3ca2fe1c308
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libextra/smallintmap.rs

@@ -246,7 +246,14 @@ impl Set<uint> for SmallIntSet {
     fn symmetric_difference(&self,
                             other: &SmallIntSet,
                             f: &fn(&uint) -> bool) -> bool {
-        self.difference(other, f) && other.difference(self, f)
+        let len = cmp::max(self.map.v.len() ,other.map.v.len());
+
+        for uint::range(0, len) |i| {
+            if self.contains(&i) ^ other.contains(&i) {
+                if !f(&i) { return false; }
+            }
+        }
+        return true;
     }
 
     /// Visit the values representing the uintersection
@@ -256,7 +263,14 @@ impl Set<uint> for SmallIntSet {
 
     /// Visit the values representing the union
     fn union(&self, other: &SmallIntSet, f: &fn(&uint) -> bool) -> bool {
-        self.each(f) && other.each(|v| self.contains(v) || f(v))
+        let len = cmp::max(self.map.v.len() ,other.map.v.len());
+
+        for uint::range(0, len) |i| {
+            if self.contains(&i) || other.contains(&i) {
+                if !f(&i) { return false; }
+            }
+        }
+        return true;
     }
 }
 

branches/snap-stage3/src/librustc/middle/trans/base.rs

@@ -1506,7 +1506,7 @@ pub fn memzero(cx: block, llptr: ValueRef, llty: TypeRef) {
     let llptr = PointerCast(cx, llptr, T_ptr(T_i8()));
     let llzeroval = C_u8(0);
     let size = IntCast(cx, machine::llsize_of(ccx, llty), ccx.int_type);
-    let align = C_i32(llalign_of_min(ccx, llty) as i32);
+    let align = C_i32(1i32);
     let volatile = C_i1(false);
     Call(cx, llintrinsicfn, [llptr, llzeroval, size, align, volatile]);
 }

branches/snap-stage3/src/test/compile-fail/issue-5543.rs

@@ -0,0 +1,20 @@
+// 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.
+//
+// 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.
+
+// xfail-test
+use core::io::ReaderUtil;
+use core::io::Reader;
+
+fn bar(r:@ReaderUtil) -> ~str { r.read_line() }
+
+fn main() {
+    let r : @Reader = io::stdin();
+    let _m = bar(r as @ReaderUtil);
+}

branches/snap-stage3/src/test/run-pass/issue-4735.rs

@@ -0,0 +1,30 @@
+// 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.
+//
+// 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.
+
+
+use std::cast::transmute;
+use std::libc::c_void;
+
+struct NonCopyable(*c_void);
+
+impl Drop for NonCopyable {
+    fn finalize(&self) {
+        let p = **self;
+        let v = unsafe { transmute::<*c_void, ~int>(p) };
+    }
+}
+
+fn main() {
+    let t = ~0;
+    let p = unsafe { transmute::<~int, *c_void>(t) };
+    let z = NonCopyable(p);
+}
+
+

branches/snap-stage3/src/test/run-pass/issue-5550.rs

@@ -0,0 +1,15 @@
+// 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.
+//
+// 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.
+
+fn main() {
+    let s: ~str = ~"foobar";
+    let mut t: &str = s;
+    t = t.slice(0, 3); // for master: str::view(t, 0, 3) maybe
+}

branches/snap-stage3/src/test/run-pass/issue-5554.rs

@@ -0,0 +1,37 @@
+// 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.
+//
+// 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.
+
+use std::num::Zero;
+
+pub struct X<T> {
+  a: T
+}
+
+// reordering these bounds stops the ICE
+impl<T: Zero + Eq + Zero>
+  Zero for X<T> {
+    fn zero() -> X<T> {
+      X { a: Zero::zero() }
+    }
+    fn is_zero(&self) -> bool {
+        self.a.is_zero()
+    }
+}
+
+macro_rules! constants {
+  () => {
+    let _0 : X<int> = Zero::zero();
+   }
+}
+
+
+pub fn main() {
+  constants!();
+}