---

yaml
---
r: 156663
b: refs/heads/try
c: 3d2cf60
h: refs/heads/master
i:
  156661: 9f30ed5
  156659: 118f1de
  156655: 94efe1e
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: a34b8dec697014f15e725215e17ea8d956c0ab1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: d44ea720fa9dfe062ef06d0eb49a58d4e7e92344
-refs/heads/try: b066d09be8454d735972e056d6b978cf48a85009
+refs/heads/try: 3d2cf60631502567007ea652f8ef299d907ee2c3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 6601b0501e31d08d3892a2d5a7d8a57ab120bf75

branches/try/src/libcore/option.rs

@@ -245,7 +245,7 @@ impl<T> Option<T> {
     /// ```
     /// let mut x = Some(2u);
     /// match x.as_mut() {
-    ///     Some(&ref mut v) => *v = 42,
+    ///     Some(v) => *v = 42,
     ///     None => {},
     /// }
     /// assert_eq!(x, Some(42u));

branches/try/src/librustrt/c_str.rs

@@ -275,15 +275,7 @@ impl Collection for CString {
     /// Return the number of bytes in the CString (not including the NUL terminator).
     #[inline]
     fn len(&self) -> uint {
-        let mut cur = self.buf;
-        let mut len = 0;
-        unsafe {
-            while *cur != 0 {
-                len += 1;
-                cur = cur.offset(1);
-            }
-        }
-        return len;
+        unsafe { libc::strlen(self.buf) as uint }
     }
 }