diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2014-12-12 11:09:32 -0500 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2014-12-15 10:23:48 -0500 |
| commit | 1718cd6ee0f27ec8b7ad3038c1985a0acf0bebdb (patch) | |
| tree | b04bacdbb64be3b62303999e659ce5fec3a97819 /src/libstd | |
| parent | b60de4bfc2cf45ebe16b9b5b768f0aad54211625 (diff) | |
| download | rust-1718cd6ee0f27ec8b7ad3038c1985a0acf0bebdb.tar.gz rust-1718cd6ee0f27ec8b7ad3038c1985a0acf0bebdb.zip | |
Remove all shadowed lifetimes.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io/mem.rs | 8 | ||||
| -rw-r--r-- | src/libstd/io/mod.rs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs index 4dc87278e2b..8eb66dec40c 100644 --- a/src/libstd/io/mem.rs +++ b/src/libstd/io/mem.rs @@ -226,7 +226,7 @@ impl<'a> Reader for &'a [u8] { impl<'a> Buffer for &'a [u8] { #[inline] - fn fill_buf<'a>(&'a mut self) -> IoResult<&'a [u8]> { + fn fill_buf(&mut self) -> IoResult<&[u8]> { if self.is_empty() { Err(io::standard_error(io::EndOfFile)) } else { @@ -268,7 +268,7 @@ impl<'a> BufWriter<'a> { /// Creates a new `BufWriter` which will wrap the specified buffer. The /// writer initially starts at position 0. #[inline] - pub fn new<'a>(buf: &'a mut [u8]) -> BufWriter<'a> { + pub fn new(buf: &'a mut [u8]) -> BufWriter<'a> { BufWriter { buf: buf, pos: 0 @@ -337,7 +337,7 @@ pub struct BufReader<'a> { impl<'a> BufReader<'a> { /// Creates a new buffered reader which will read the specified buffer #[inline] - pub fn new<'a>(buf: &'a [u8]) -> BufReader<'a> { + pub fn new(buf: &'a [u8]) -> BufReader<'a> { BufReader { buf: buf, pos: 0 @@ -384,7 +384,7 @@ impl<'a> Seek for BufReader<'a> { impl<'a> Buffer for BufReader<'a> { #[inline] - fn fill_buf<'a>(&'a mut self) -> IoResult<&'a [u8]> { + fn fill_buf(&mut self) -> IoResult<&[u8]> { if self.pos < self.buf.len() { Ok(self.buf[self.pos..]) } else { diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 4baeaabc6c6..a384610e504 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -981,7 +981,7 @@ impl<'a, R: Reader> Reader for RefReader<'a, R> { } impl<'a, R: Buffer> Buffer for RefReader<'a, R> { - fn fill_buf<'a>(&'a mut self) -> IoResult<&'a [u8]> { self.inner.fill_buf() } + fn fill_buf(&mut self) -> IoResult<&[u8]> { self.inner.fill_buf() } fn consume(&mut self, amt: uint) { self.inner.consume(amt) } } |
