Skip to content

Commit 79f5856

Browse files
committed
Removed uneeded explicit lifetimes.
1 parent 3eec435 commit 79f5856

File tree

8 files changed

+9
-10
lines changed

8 files changed

+9
-10
lines changed

src/client/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ impl<S> Client<S>
159159
}
160160

161161
/// Sends a single message to the remote endpoint.
162-
pub fn send_message<'m, M>(&mut self, message: &'m M) -> WebSocketResult<()>
162+
pub fn send_message<M>(&mut self, message: &M) -> WebSocketResult<()>
163163
where M: ws::Message
164164
{
165165
self.sender.send_message(self.stream.get_mut(), message)
@@ -188,7 +188,7 @@ impl<S> Client<S>
188188
///
189189
/// let message: Message = client.recv_message().unwrap();
190190
/// ```
191-
pub fn recv_message<'m, I>(&mut self) -> WebSocketResult<OwnedMessage>
191+
pub fn recv_message<I>(&mut self) -> WebSocketResult<OwnedMessage>
192192
where I: Iterator<Item = DataFrame>
193193
{
194194
self.receiver.recv_message(&mut self.stream)

src/codec/http.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use hyper::buffer::BufReader;
1313
use tokio_io::codec::{Decoder, Encoder};
1414
use bytes::BytesMut;
1515
use bytes::BufMut;
16-
use result::WebSocketError;
1716

1817
#[derive(Copy, Clone, Debug)]
1918
pub struct HttpClientCodec;

src/message.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ impl ws::dataframe::DataFrame for OwnedMessage {
321321
}
322322

323323
#[inline(always)]
324-
fn reserved<'b>(&'b self) -> &'b [bool; 3] {
324+
fn reserved(&self) -> &[bool; 3] {
325325
FALSE_RESERVED_BITS
326326
}
327327

src/receiver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ impl<R> Reader<R>
3939
}
4040

4141
/// Reads a single message from this receiver.
42-
pub fn recv_message<'m, I>(&mut self) -> WebSocketResult<OwnedMessage>
42+
pub fn recv_message<I>(&mut self) -> WebSocketResult<OwnedMessage>
4343
where I: Iterator<Item = DataFrame>
4444
{
4545
self.receiver.recv_message(&mut self.stream)

src/sender.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ impl<W> Writer<W>
3232
}
3333

3434
/// Sends a single message to the remote endpoint.
35-
pub fn send_message<'m, M>(&mut self, message: &'m M) -> WebSocketResult<()>
35+
pub fn send_message<M>(&mut self, message: &M) -> WebSocketResult<()>
3636
where M: ws::Message
3737
{
3838
self.sender.send_message(&mut self.stream, message)

src/server/upgrade/async.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ impl<S> WsUpgrade<S>
1515
}
1616

1717
pub fn async_accept_with(
18-
mut self,
18+
self,
1919
custom_headers: &Headers,
2020
) -> Result<ClientNew<S>, (S, io::Error)> {
2121
unimplemented!();
@@ -25,7 +25,7 @@ impl<S> WsUpgrade<S>
2525
unimplemented!();
2626
}
2727

28-
pub fn async_reject_with(mut self, headers: &Headers) -> Result<S, (S, io::Error)> {
28+
pub fn async_reject_with(self, headers: &Headers) -> Result<S, (S, io::Error)> {
2929
unimplemented!();
3030
}
3131
}

src/ws/dataframe.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub trait DataFrame {
1717
/// What type of data does this dataframe contain?
1818
fn opcode(&self) -> u8;
1919
/// Reserved bits of this dataframe
20-
fn reserved<'a>(&'a self) -> &'a [bool; 3];
20+
fn reserved(&self) -> &[bool; 3];
2121

2222
/// How long (in bytes) is this dataframe's payload
2323
fn size(&self) -> usize;

src/ws/sender.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub trait Sender {
2121
}
2222

2323
/// Sends a single message using this sender.
24-
fn send_message<'m, M, W>(&mut self, writer: &mut W, message: &'m M) -> WebSocketResult<()>
24+
fn send_message<M, W>(&mut self, writer: &mut W, message: &M) -> WebSocketResult<()>
2525
where M: Message,
2626
W: Write
2727
{

0 commit comments

Comments
 (0)