---

yaml
---
r: 143799
b: refs/heads/try2
c: fb9b279
h: refs/heads/master
i:
  143797: 863d734
  143795: 02dc936
  143791: 8acbb63
v: v3

Author: erickt

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: c8e454097bf44b1b5b91b46da08dabe9f140a6ee
+refs/heads/try2: fb9b27910b41e714dfd6b3ccc48161260943c9cf
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/c_str.rs

@@ -27,7 +27,7 @@ pub struct CString {
     priv owns_buffer_: bool,
 }
 
-impl<'self> CString {
+impl CString {
     /// Create a C String from a pointer.
     pub fn new(buf: *libc::c_char, owns_buffer: bool) -> CString {
         CString { buf: buf, owns_buffer_: owns_buffer }
@@ -80,7 +80,7 @@ impl<'self> CString {
     /// # Failure
     ///
     /// Fails if the CString is null.
-    pub fn as_bytes(&self) -> &'self [u8] {
+    pub fn as_bytes<'a>(&'a self) -> &'a [u8] {
         if self.buf.is_null() { fail!("CString is null!"); }
         unsafe {
             let len = libc::strlen(self.buf) as uint;
@@ -89,7 +89,7 @@ impl<'self> CString {
     }
 
     /// Return a CString iterator.
-    fn iter(&self) -> CStringIterator<'self> {
+    fn iter<'a>(&'a self) -> CStringIterator<'a> {
         CStringIterator {
             ptr: self.buf,
             lifetime: unsafe { cast::transmute(self.buf) },