From a7d38e29e5f2601307d1265700fa6802854ada0c Mon Sep 17 00:00:00 2001
From: Carl Lerche <me@carllerche.com>
Date: Fri, 23 Sep 2016 14:51:48 -0700
Subject: [PATCH] Remove extra lifetime sigils
---
src/imp/buf/append.rs | 2 +-
src/imp/buf/byte.rs | 8 ++++----
src/imp/buf/mod.rs | 4 ++--
src/imp/buf/take.rs | 4 ++--
src/lib.rs | 2 ++
5 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/imp/buf/append.rs b/src/imp/buf/append.rs
index 13a11c8..30f326c 100644
--- a/src/imp/buf/append.rs
+++ b/src/imp/buf/append.rs
@@ -99,7 +99,7 @@ impl MutBuf for AppendBuf {
}
#[inline]
- unsafe fn mut_bytes<'a>(&'a mut self) -> &'a mut [u8] {
+ unsafe fn mut_bytes(&mut self) -> &mut [u8] {
let wr = self.wr as usize;
let cap = self.cap as usize;
self.mem.mut_bytes_slice(wr, cap)
diff --git a/src/imp/buf/byte.rs b/src/imp/buf/byte.rs
index 2b14744..5120fd2 100644
--- a/src/imp/buf/byte.rs
+++ b/src/imp/buf/byte.rs
@@ -133,7 +133,7 @@ impl Buf for ByteBuf {
}
#[inline]
- fn bytes<'a>(&'a self) -> &'a [u8] {
+ fn bytes(&self) -> &[u8] {
unsafe { &self.mem.bytes()[self.pos()..self.lim()] }
}
@@ -212,7 +212,7 @@ impl MutByteBuf {
cnt
}
- pub fn bytes<'a>(&'a self) -> &'a [u8] {
+ pub fn bytes(&self) -> &[u8] {
unsafe { &self.buf.mem.bytes()[..self.buf.pos()] }
}
}
@@ -224,9 +224,9 @@ impl MutBuf for MutByteBuf {
unsafe fn advance(&mut self, cnt: usize) {
self.buf.advance(cnt)
- }
- unsafe fn mut_bytes<'a>(&'a mut self) -> &'a mut [u8] {
+ }
+ unsafe fn mut_bytes(&mut self) -> &mut [u8] {
let pos = self.buf.pos();
let lim = self.buf.lim();
&mut self.buf.mem.mut_bytes()[pos..lim]
diff --git a/src/imp/buf/mod.rs b/src/imp/buf/mod.rs
index 53c6c05..7a82aa6 100644
--- a/src/imp/buf/mod.rs
+++ b/src/imp/buf/mod.rs
@@ -201,7 +201,7 @@ pub trait MutBuf {
/// length between 0 and `MutBuf::remaining()`.
///
/// The returned byte slice may represent uninitialized memory.
- unsafe fn mut_bytes<'a>(&'a mut self) -> &'a mut [u8];
+ unsafe fn mut_bytes(&mut self) -> &mut [u8];
fn copy_from<S: Source>(&mut self, src: S) -> usize
where Self: Sized {
@@ -617,7 +617,7 @@ impl<T: AsMut<[u8]> + AsRef<[u8]>> MutBuf for io::Cursor<T> {
/// length between 0 and `MutBuf::remaining()`.
///
/// The returned byte slice may represent uninitialized memory.
- unsafe fn mut_bytes<'a>(&'a mut self) -> &'a mut [u8] {
+ unsafe fn mut_bytes(&mut self) -> &mut [u8] {
let pos = self.position() as usize;
&mut (self.get_mut().as_mut())[pos..]
}
diff --git a/src/imp/buf/take.rs b/src/imp/buf/take.rs
index 69ab443..e9f760c 100644
--- a/src/imp/buf/take.rs
+++ b/src/imp/buf/take.rs
@@ -41,7 +41,7 @@ impl<T: Buf> Buf for Take<T> {
cmp::min(self.inner.remaining(), self.limit)
}
- fn bytes<'a>(&'a self) -> &'a [u8] {
+ fn bytes(&self) -> &[u8] {
&self.inner.bytes()[..self.limit]
}
@@ -57,7 +57,7 @@ impl<T: MutBuf> MutBuf for Take<T> {
cmp::min(self.inner.remaining(), self.limit)
}
- unsafe fn mut_bytes<'a>(&'a mut self) -> &'a mut [u8] {
+ unsafe fn mut_bytes(&mut self) -> &mut [u8] {
&mut self.inner.mut_bytes()[..self.limit]
}
diff --git a/src/lib.rs b/src/lib.rs
index 4169766..cf153ea 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -14,6 +14,8 @@ pub use imp::buf::{Buf, MutBuf};
pub use imp::bytes::Bytes;
pub mod buf {
+ //! Traits, helpers, and type definitions for working with buffers.
+
pub use imp::buf::{
Source,
Sink,
--
GitLab