chore: apply rustfmt to all crates (#917)

This commit is contained in:
Carl Lerche
2019-02-21 11:56:15 -08:00
committed by GitHub
parent ab595d0825
commit 80162306e7
253 changed files with 3710 additions and 3407 deletions
+5 -3
View File
@@ -1,7 +1,7 @@
#![allow(deprecated)]
use bytes::{Bytes, BufMut, BytesMut};
use codec::{Encoder, Decoder};
use bytes::{BufMut, Bytes, BytesMut};
use codec::{Decoder, Encoder};
use std::io;
/// A simple `Codec` implementation that just ships bytes around.
@@ -11,7 +11,9 @@ pub struct BytesCodec(());
impl BytesCodec {
/// Creates a new `BytesCodec` for shipping around raw bytes.
pub fn new() -> BytesCodec { BytesCodec(()) }
pub fn new() -> BytesCodec {
BytesCodec(())
}
}
impl Decoder for BytesCodec {
+6 -6
View File
@@ -1,10 +1,10 @@
use std::io;
use bytes::BytesMut;
use std::io;
use {AsyncWrite, AsyncRead};
use super::encoder::Encoder;
use {AsyncRead, AsyncWrite};
use ::_tokio_codec::Framed;
use _tokio_codec::Framed;
/// Decoding of frames via buffers.
///
@@ -85,8 +85,7 @@ pub trait Decoder {
if buf.is_empty() {
Ok(None)
} else {
Err(io::Error::new(io::ErrorKind::Other,
"bytes remaining on stream").into())
Err(io::Error::new(io::ErrorKind::Other, "bytes remaining on stream").into())
}
}
}
@@ -110,7 +109,8 @@ pub trait Decoder {
/// calling `split` on the `Framed` returned by this method, which will
/// break them into separate objects, allowing them to interact more easily.
fn framed<T: AsyncRead + AsyncWrite + Sized>(self, io: T) -> Framed<T, Self>
where Self: Encoder + Sized,
where
Self: Encoder + Sized,
{
Framed::new(io, self)
}
+2 -3
View File
@@ -1,5 +1,5 @@
use std::io;
use bytes::BytesMut;
use std::io;
/// Trait of helper objects to write out messages as bytes, for use with
/// `FramedWrite`.
@@ -21,6 +21,5 @@ pub trait Encoder {
/// This method will encode `item` into the byte buffer provided by `dst`.
/// The `dst` provided is an internal buffer of the `Framed` instance and
/// will be written out when possible.
fn encode(&mut self, item: Self::Item, dst: &mut BytesMut)
-> Result<(), Self::Error>;
fn encode(&mut self, item: Self::Item, dst: &mut BytesMut) -> Result<(), Self::Error>;
}
+5 -9
View File
@@ -1,7 +1,7 @@
#![allow(deprecated)]
use bytes::{BufMut, BytesMut};
use codec::{Encoder, Decoder};
use codec::{Decoder, Encoder};
use std::{io, str};
/// A simple `Codec` implementation that splits up data into lines.
@@ -25,10 +25,8 @@ impl LinesCodec {
}
fn utf8(buf: &[u8]) -> Result<&str, io::Error> {
str::from_utf8(buf).map_err(|_|
io::Error::new(
io::ErrorKind::InvalidData,
"Unable to decode input as UTF8"))
str::from_utf8(buf)
.map_err(|_| io::Error::new(io::ErrorKind::InvalidData, "Unable to decode input as UTF8"))
}
fn without_carriage_return(s: &[u8]) -> &[u8] {
@@ -44,12 +42,10 @@ impl Decoder for LinesCodec {
type Error = io::Error;
fn decode(&mut self, buf: &mut BytesMut) -> Result<Option<String>, io::Error> {
if let Some(newline_offset) =
buf[self.next_index..].iter().position(|b| *b == b'\n')
{
if let Some(newline_offset) = buf[self.next_index..].iter().position(|b| *b == b'\n') {
let newline_index = newline_offset + self.next_index;
let line = buf.split_to(newline_index + 1);
let line = &line[..line.len()-1];
let line = &line[..line.len() - 1];
let line = without_carriage_return(line);
let line = utf8(line)?;
self.next_index = 0;
+3 -3
View File
@@ -18,14 +18,14 @@
#![doc(hidden)]
#![allow(deprecated)]
mod bytes_codec;
mod decoder;
mod encoder;
mod bytes_codec;
mod lines_codec;
pub use self::bytes_codec::BytesCodec;
pub use self::decoder::Decoder;
pub use self::encoder::Encoder;
pub use self::bytes_codec::BytesCodec;
pub use self::lines_codec::LinesCodec;
pub use framed::{Framed, FramedParts};
@@ -374,5 +374,5 @@ pub mod length_delimited {
//! [`Encoder`]: ../trait.Encoder.html
//! [`BytesMut`]: https://docs.rs/bytes/0.4/bytes/struct.BytesMut.html
pub use ::length_delimited::*;
pub use length_delimited::*;
}