---

yaml
---
r: 156127
b: refs/heads/auto
c: 3d2cf60
h: refs/heads/master
i:
  156125: 87a5256
  156123: 6fdeedc
  156119: 1fe757b
  156111: 7fb5045
  156095: 958278e
v: v3

Author: bors

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: b066d09be8454d735972e056d6b978cf48a85009
+refs/heads/auto: 3d2cf60631502567007ea652f8ef299d907ee2c3
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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/auto/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 }
     }
 }