From 422f7bbc451070be37025db9cfbdbd9d7c71b0d2 Mon Sep 17 00:00:00 2001 From: Alexey Galakhov Date: Tue, 31 Jan 2017 19:03:45 +0100 Subject: [PATCH] trivial: move MIN_READ to input_buffer --- src/handshake/client.rs | 4 +--- src/input_buffer.rs | 3 +++ src/protocol/frame/mod.rs | 10 ++++------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/handshake/client.rs b/src/handshake/client.rs index 038880e..3fdb2ef 100644 --- a/src/handshake/client.rs +++ b/src/handshake/client.rs @@ -7,7 +7,7 @@ use httparse; use httparse::Status; use url::Url; -use input_buffer::InputBuffer; +use input_buffer::{InputBuffer, MIN_READ}; use error::{Error, Result}; use super::{ Headers, @@ -20,8 +20,6 @@ use protocol::{ WebSocket, Role, }; -const MIN_READ: usize = 4096; - /// Client request. pub struct Request { pub url: Url, diff --git a/src/input_buffer.rs b/src/input_buffer.rs index 58458bc..e08e704 100644 --- a/src/input_buffer.rs +++ b/src/input_buffer.rs @@ -4,6 +4,9 @@ use bytes::{Buf, BufMut}; /// A FIFO buffer for reading packets from network. pub struct InputBuffer(Cursor>); +/// The minimum read size. +pub const MIN_READ: usize = 4096; + /// Size limit error. pub struct SizeLimit; diff --git a/src/protocol/frame/mod.rs b/src/protocol/frame/mod.rs index af4fbde..9c9b955 100644 --- a/src/protocol/frame/mod.rs +++ b/src/protocol/frame/mod.rs @@ -6,15 +6,13 @@ pub use self::frame::Frame; use std::io::{Read, Write}; -use input_buffer; +use input_buffer::{InputBuffer, MIN_READ}; use error::{Error, Result}; -const MIN_READ: usize = 4096; - /// A reader and writer for WebSocket frames. pub struct FrameSocket { stream: Stream, - in_buffer: input_buffer::InputBuffer, + in_buffer: InputBuffer, out_buffer: Vec, } @@ -23,7 +21,7 @@ impl FrameSocket { pub fn new(stream: Stream) -> Self { FrameSocket { stream: stream, - in_buffer: input_buffer::InputBuffer::with_capacity(MIN_READ), + in_buffer: InputBuffer::with_capacity(MIN_READ), out_buffer: Vec::new(), } } @@ -31,7 +29,7 @@ impl FrameSocket { pub fn from_partially_read(stream: Stream, part: Vec) -> Self { FrameSocket { stream: stream, - in_buffer: input_buffer::InputBuffer::from_partially_read(part), + in_buffer: InputBuffer::from_partially_read(part), out_buffer: Vec::new(), } }