Skip to content

Commit

Permalink
Removed uneeded explicit lifetimes.
Browse files Browse the repository at this point in the history
  • Loading branch information
illegalprime committed May 22, 2017
1 parent 3eec435 commit 79f5856
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/client/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ impl<S> Client<S>
}

/// Sends a single message to the remote endpoint.
pub fn send_message<'m, M>(&mut self, message: &'m M) -> WebSocketResult<()>
pub fn send_message<M>(&mut self, message: &M) -> WebSocketResult<()>
where M: ws::Message
{
self.sender.send_message(self.stream.get_mut(), message)
Expand Down Expand Up @@ -188,7 +188,7 @@ impl<S> Client<S>
///
/// let message: Message = client.recv_message().unwrap();
/// ```
pub fn recv_message<'m, I>(&mut self) -> WebSocketResult<OwnedMessage>
pub fn recv_message<I>(&mut self) -> WebSocketResult<OwnedMessage>
where I: Iterator<Item = DataFrame>
{
self.receiver.recv_message(&mut self.stream)
Expand Down
1 change: 0 additions & 1 deletion src/codec/http.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ use hyper::buffer::BufReader;
use tokio_io::codec::{Decoder, Encoder};
use bytes::BytesMut;
use bytes::BufMut;
use result::WebSocketError;

#[derive(Copy, Clone, Debug)]
pub struct HttpClientCodec;
Expand Down
2 changes: 1 addition & 1 deletion src/message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ impl ws::dataframe::DataFrame for OwnedMessage {
}

#[inline(always)]
fn reserved<'b>(&'b self) -> &'b [bool; 3] {
fn reserved(&self) -> &[bool; 3] {
FALSE_RESERVED_BITS
}

Expand Down
2 changes: 1 addition & 1 deletion src/receiver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ impl<R> Reader<R>
}

/// Reads a single message from this receiver.
pub fn recv_message<'m, I>(&mut self) -> WebSocketResult<OwnedMessage>
pub fn recv_message<I>(&mut self) -> WebSocketResult<OwnedMessage>
where I: Iterator<Item = DataFrame>
{
self.receiver.recv_message(&mut self.stream)
Expand Down
2 changes: 1 addition & 1 deletion src/sender.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ impl<W> Writer<W>
}

/// Sends a single message to the remote endpoint.
pub fn send_message<'m, M>(&mut self, message: &'m M) -> WebSocketResult<()>
pub fn send_message<M>(&mut self, message: &M) -> WebSocketResult<()>
where M: ws::Message
{
self.sender.send_message(&mut self.stream, message)
Expand Down
4 changes: 2 additions & 2 deletions src/server/upgrade/async.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ impl<S> WsUpgrade<S>
}

pub fn async_accept_with(
mut self,
self,
custom_headers: &Headers,
) -> Result<ClientNew<S>, (S, io::Error)> {
unimplemented!();
Expand All @@ -25,7 +25,7 @@ impl<S> WsUpgrade<S>
unimplemented!();
}

pub fn async_reject_with(mut self, headers: &Headers) -> Result<S, (S, io::Error)> {
pub fn async_reject_with(self, headers: &Headers) -> Result<S, (S, io::Error)> {
unimplemented!();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/ws/dataframe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub trait DataFrame {
/// What type of data does this dataframe contain?
fn opcode(&self) -> u8;
/// Reserved bits of this dataframe
fn reserved<'a>(&'a self) -> &'a [bool; 3];
fn reserved(&self) -> &[bool; 3];

/// How long (in bytes) is this dataframe's payload
fn size(&self) -> usize;
Expand Down
2 changes: 1 addition & 1 deletion src/ws/sender.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub trait Sender {
}

/// Sends a single message using this sender.
fn send_message<'m, M, W>(&mut self, writer: &mut W, message: &'m M) -> WebSocketResult<()>
fn send_message<M, W>(&mut self, writer: &mut W, message: &M) -> WebSocketResult<()>
where M: Message,
W: Write
{
Expand Down

0 comments on commit 79f5856

Please sign in to comment.