Merge branch 'devel' into clippy

pull/39/head
Daniel Abramov 7 years ago committed by GitHub
commit 03c9657ae2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/handshake/client.rs
  2. 2
      src/protocol/frame/frame.rs
  3. 7
      src/protocol/mod.rs

@ -52,7 +52,7 @@ impl<'t> Request<'t> {
/// Adds a custom header to the request.
pub fn add_header(&mut self, name: Cow<'t, str>, value: Cow<'t, str>) {
let mut headers = self.extra_headers.take().unwrap_or_else(|| vec![]);
let mut headers = self.extra_headers.take().unwrap_or_else(Vec::new);
headers.push((name, value));
self.extra_headers = Some(headers);
}

@ -107,7 +107,7 @@ impl FrameHeader {
| if self.mask.is_some() { 0x80 } else { 0 }
};
output.write(&[one, two])?;
output.write_all(&[one, two])?;
match lenfmt {
LengthFormat::U8(_) => (),
LengthFormat::U16 => output.write_u16::<NetworkEndian>(length as u16)?,

@ -109,6 +109,13 @@ impl<Stream> WebSocket<Stream> {
self.socket.get_mut()
}
/// Change the configuration.
pub fn set_config(&mut self, set_func: impl FnOnce(&mut WebSocketConfig)) {
set_func(&mut self.config)
}
}
impl<Stream> WebSocket<Stream> {
/// Convert a frame socket into a WebSocket.
fn from_frame_socket(
socket: FrameSocket<Stream>,

Loading…
Cancel
Save