diff options
| author | bors <bors@rust-lang.org> | 2013-12-11 12:56:22 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-12-11 12:56:22 -0800 |
| commit | 1b12dca7f97a51c6cbb4f47ea6e095d841a97c1a (patch) | |
| tree | 19f1a66a4ced0e180c4fa1720ecfe53b14e92465 /src/libstd/ascii.rs | |
| parent | 47d10c745ebcc31768e98083c8c6d5396f4edcdb (diff) | |
| parent | 5731ca3078318a66a13208133d8839a9f9f92629 (diff) | |
| download | rust-1b12dca7f97a51c6cbb4f47ea6e095d841a97c1a.tar.gz rust-1b12dca7f97a51c6cbb4f47ea6e095d841a97c1a.zip | |
auto merge of #10897 : boredomist/rust/remove-self-lifetime, r=brson
Also remove all instances of 'self within the codebase. This fixes #10889. To make reviewing easier the following files were modified with more than a dumb text replacement: - `src/test/compile-fail/lifetime-no-keyword.rs` - `src/test/compile-fail/lifetime-obsoleted-self.rs` - `src/test/compile-fail/regions-free-region-ordering-incorrect.rs` - `src/libsyntax/parse/lexer.rs`
Diffstat (limited to 'src/libstd/ascii.rs')
| -rw-r--r-- | src/libstd/ascii.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index c43b4e9b6ea..2242ded94f5 100644 --- a/src/libstd/ascii.rs +++ b/src/libstd/ascii.rs @@ -145,15 +145,15 @@ pub trait AsciiCast<T> { fn is_ascii(&self) -> bool; } -impl<'self> AsciiCast<&'self[Ascii]> for &'self [u8] { +impl<'a> AsciiCast<&'a[Ascii]> for &'a [u8] { #[inline] - fn to_ascii(&self) -> &'self[Ascii] { + fn to_ascii(&self) -> &'a[Ascii] { assert!(self.is_ascii()); unsafe {self.to_ascii_nocheck()} } #[inline] - unsafe fn to_ascii_nocheck(&self) -> &'self[Ascii] { + unsafe fn to_ascii_nocheck(&self) -> &'a[Ascii] { cast::transmute(*self) } @@ -166,15 +166,15 @@ impl<'self> AsciiCast<&'self[Ascii]> for &'self [u8] { } } -impl<'self> AsciiCast<&'self [Ascii]> for &'self str { +impl<'a> AsciiCast<&'a [Ascii]> for &'a str { #[inline] - fn to_ascii(&self) -> &'self [Ascii] { + fn to_ascii(&self) -> &'a [Ascii] { assert!(self.is_ascii()); unsafe { self.to_ascii_nocheck() } } #[inline] - unsafe fn to_ascii_nocheck(&self) -> &'self [Ascii] { + unsafe fn to_ascii_nocheck(&self) -> &'a [Ascii] { cast::transmute(*self) } @@ -272,7 +272,7 @@ pub trait AsciiStr { fn eq_ignore_case(self, other: &[Ascii]) -> bool; } -impl<'self> AsciiStr for &'self [Ascii] { +impl<'a> AsciiStr for &'a [Ascii] { #[inline] fn as_str_ascii<'a>(&'a self) -> &'a str { unsafe { cast::transmute(*self) } @@ -351,7 +351,7 @@ pub trait StrAsciiExt { fn eq_ignore_ascii_case(&self, other: &str) -> bool; } -impl<'self> StrAsciiExt for &'self str { +impl<'a> StrAsciiExt for &'a str { #[inline] fn to_ascii_upper(&self) -> ~str { unsafe { str_copy_map_bytes(*self, ASCII_UPPER_MAP) } |
