---

yaml
---
r: 229245
b: refs/heads/try
c: 8f3901f
h: refs/heads/master
i:
  229243: fe28b3c
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 38d627fe480c92e6123cff7c2f050b1943c89d64
+refs/heads/try: 8f3901feabf6c9072e533ae69b14b5761909f642
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/doc/reference.md

@@ -1501,7 +1501,29 @@ have an implementation for `Shape`. Multiple supertraits are separated by `+`,
 `trait Circle : Shape + PartialEq { }`. In an implementation of `Circle` for a
 given type `T`, methods can refer to `Shape` methods, since the typechecker
 checks that any type with an implementation of `Circle` also has an
-implementation of `Shape`.
+implementation of `Shape`:
+
+```rust
+struct Foo;
+
+trait Shape { fn area(&self) -> f64; }
+trait Circle : Shape { fn radius(&self) -> f64; }
+# impl Shape for Foo {
+#     fn area(&self) -> f64 {
+#         0.0
+#     }
+# }
+impl Circle for Foo {
+    fn radius(&self) -> f64 {
+        println!("calling area: {}", self.area());
+
+        0.0
+    }
+}
+
+let c = Foo;
+c.radius();
+```
 
 In type-parameterized functions, methods of the supertrait may be called on
 values of subtrait-bound type parameters. Referring to the previous example of

branches/try/src/libstd/fs.rs

@@ -855,6 +855,8 @@ pub fn rename<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> io::Result<()>
 /// Note that if `from` and `to` both point to the same file, then the file
 /// will likely get truncated by this operation.
 ///
+/// On success, the total number of bytes copied is returned.
+///
 /// # Errors
 ///
 /// This function will return an error in the following situations, but is not

branches/try/src/libstd/rand/os.rs

@@ -205,9 +205,7 @@ mod imp {
         _dummy: (),
     }
 
-    // Fake definition; this is actually a struct, but we don't use the
-    // contents here.
-    type SecRandom = c_void;
+    enum SecRandom {}
 
     #[allow(non_upper_case_globals)]
     const kSecRandomDefault: *const SecRandom = 0 as *const SecRandom;

branches/try/src/libstd/rt/unwind/seh64_gnu.rs

@@ -60,8 +60,8 @@ pub struct EXCEPTION_RECORD {
     ExceptionInformation: [ULONG_PTR; 15],
 }
 
-pub type CONTEXT = c_void;
-pub type UNWIND_HISTORY_TABLE = c_void;
+pub enum CONTEXT {}
+pub enum UNWIND_HISTORY_TABLE {}
 
 #[repr(C)]
 pub struct RUNTIME_FUNCTION {