---

yaml
---
r: 63847
b: refs/heads/snap-stage3
c: 9340fd5
h: refs/heads/master
i:
  63845: 9b74613
  63843: bb3aa58
  63839: c0ead60
v: v3

Author: msullivan

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: c05165bf93e05a8473461716579c47355bd1659d
+refs/heads/snap-stage3: 9340fd5ce0d7bd0f1bbfbda73944920bcc1364eb
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/compile-fail/impl-bounds-checking.rs

@@ -0,0 +1,24 @@
+// 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.
+
+pub trait Clone2 {
+    fn clone(&self) -> Self;
+}
+
+
+trait Getter<T: Clone2> {
+    fn get(&self) -> T;
+}
+
+impl Getter<int> for int { //~ ERROR failed to find an implementation of trait Clone2 for int
+    fn get(&self) -> int { *self }
+}
+
+fn main() { }

branches/snap-stage3/src/test/run-pass/bug-7183-generics.rs

@@ -0,0 +1,45 @@
+// 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.
+
+#[allow(default_methods)]
+trait Speak {
+    fn say(&self, s:&str) -> ~str;
+    fn hi(&self) -> ~str { hello(self) }
+}
+
+fn hello<S:Speak>(s:&S) -> ~str{
+    s.say("hello")
+}
+
+impl Speak for int {
+    fn say(&self, s:&str) -> ~str {
+        fmt!("%s: %d", s, *self)
+    }
+}
+
+impl<T: Speak> Speak for Option<T> {
+    fn say(&self, s:&str) -> ~str {
+        match *self {
+            None => fmt!("%s - none", s),
+            Some(ref x) => { ~"something!" + x.say(s) }
+        }
+    }
+}
+
+
+fn main() {
+    assert_eq!(3.hi(), ~"hello: 3");
+    assert_eq!(Some(Some(3)).hi(), ~"something!something!hello: 3");
+    assert_eq!(None::<int>.hi(), ~"hello - none");
+
+    // These fail because of a bug in monomorphization's ID generation.
+    //assert_eq!(Some(None::<int>).hi(), ~"something!hello - none");
+    //assert_eq!(Some(3).hi(), ~"something!hello: 3");
+}

branches/snap-stage3/src/test/run-pass/trait-with-bounds-default.rs

@@ -0,0 +1,41 @@
+// 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.
+
+pub trait Clone2 {
+    /// Returns a copy of the value. The contents of owned pointers
+    /// are copied to maintain uniqueness, while the contents of
+    /// managed pointers are not copied.
+    fn clone(&self) -> Self;
+}
+
+#[allow(default_methods)]
+trait Getter<T: Clone> {
+    fn do_get(&self) -> T;
+
+    fn do_get2(&self) -> (T, T) {
+        let x = self.do_get();
+        (x.clone(), x.clone())
+    }
+
+}
+
+impl Getter<int> for int {
+    fn do_get(&self) -> int { *self }
+}
+
+impl<T: Clone> Getter<T> for Option<T> {
+    fn do_get(&self) -> T { self.get_ref().clone() }
+}
+
+
+fn main() {
+    assert_eq!(3.do_get2(), (3, 3));
+    assert_eq!(Some(~"hi").do_get2(), (~"hi", ~"hi"));
+}