Reformat rust code with rustfmt 1.0
diff --git a/lib/rs/src/transport/buffered.rs b/lib/rs/src/transport/buffered.rs
index 41b941c..87cfeff 100644
--- a/lib/rs/src/transport/buffered.rs
+++ b/lib/rs/src/transport/buffered.rs
@@ -192,7 +192,10 @@
/// `read_capacity` and an internal write buffer of size
/// `write_capacity` that wraps the given `TIoChannel`.
pub fn with_capacity(write_capacity: usize, channel: C) -> TBufferedWriteTransport<C> {
- assert!(write_capacity > 0, "write buffer size must be a positive integer");
+ assert!(
+ write_capacity > 0,
+ "write buffer size must be a positive integer"
+ );
TBufferedWriteTransport {
buf: Vec::with_capacity(write_capacity),
diff --git a/lib/rs/src/transport/framed.rs b/lib/rs/src/transport/framed.rs
index 7e0f8b6..a009307 100644
--- a/lib/rs/src/transport/framed.rs
+++ b/lib/rs/src/transport/framed.rs
@@ -201,8 +201,7 @@
if let 0 = message_size {
return Ok(());
} else {
- self.channel
- .write_i32::<BigEndian>(message_size as i32)?;
+ self.channel.write_i32::<BigEndian>(message_size as i32)?;
}
// will spin if the underlying channel can't be written to
@@ -240,7 +239,7 @@
#[cfg(test)]
mod tests {
use super::*;
- use ::transport::mem::TBufferChannel;
+ use transport::mem::TBufferChannel;
// FIXME: test a forced reserve
@@ -249,12 +248,10 @@
let c = TBufferChannel::with_capacity(10, 10);
let mut t = TFramedReadTransport::with_capacity(8, c);
- t.chan.set_readable_bytes(
- &[
- 0x00, 0x00, 0x00, 0x04, /* message size */
- 0x00, 0x01, 0x02, 0x03 /* message body */
- ]
- );
+ t.chan.set_readable_bytes(&[
+ 0x00, 0x00, 0x00, 0x04, /* message size */
+ 0x00, 0x01, 0x02, 0x03, /* message body */
+ ]);
let mut buf = vec![0; 8];
@@ -268,12 +265,10 @@
let c = TBufferChannel::with_capacity(10, 10);
let mut t = TFramedReadTransport::with_capacity(2, c);
- t.chan.set_readable_bytes(
- &[
- 0x00, 0x00, 0x00, 0x04, /* message size */
- 0x00, 0x01, 0x02, 0x03 /* message body */
- ]
- );
+ t.chan.set_readable_bytes(&[
+ 0x00, 0x00, 0x00, 0x04, /* message size */
+ 0x00, 0x01, 0x02, 0x03, /* message body */
+ ]);
let mut buf = vec![0; 8];
@@ -291,12 +286,10 @@
// 1st message
//
- t.chan.set_readable_bytes(
- &[
- 0x00, 0x00, 0x00, 0x04, /* message size */
- 0x00, 0x01, 0x02, 0x03 /* message body */
- ]
- );
+ t.chan.set_readable_bytes(&[
+ 0x00, 0x00, 0x00, 0x04, /* message size */
+ 0x00, 0x01, 0x02, 0x03, /* message body */
+ ]);
let mut buf = vec![0; 8];
@@ -308,12 +301,10 @@
// 2nd message
//
- t.chan.set_readable_bytes(
- &[
- 0x00, 0x00, 0x00, 0x01, /* message size */
- 0x04 /* message body */
- ]
- );
+ t.chan.set_readable_bytes(&[
+ 0x00, 0x00, 0x00, 0x01, /* message size */
+ 0x04, /* message body */
+ ]);
let mut buf = vec![0; 8];
@@ -356,8 +347,8 @@
assert!(t.flush().is_ok());
let expected_bytes = [
- 0x00, 0x00, 0x00, 0x05, /* message size */
- 0x00, 0x01, 0x02, 0x03, 0x04 /* message body */
+ 0x00, 0x00, 0x00, 0x05, /* message size */
+ 0x00, 0x01, 0x02, 0x03, 0x04, /* message body */
];
assert_eq_transport_written_bytes!(t, expected_bytes);
@@ -382,8 +373,8 @@
assert!(t.flush().is_ok());
let expected_bytes = [
- 0x00, 0x00, 0x00, 0x03, /* message size */
- 0x00, 0x01, 0x02 /* message body */
+ 0x00, 0x00, 0x00, 0x03, /* message size */
+ 0x00, 0x01, 0x02, /* message body */
];
assert_eq_transport_written_bytes!(t, expected_bytes);
@@ -408,8 +399,8 @@
assert!(t.flush().is_ok());
let expected_bytes = [
- 0x00, 0x00, 0x00, 0x03, /* message size */
- 0x00, 0x01, 0x02 /* message body */
+ 0x00, 0x00, 0x00, 0x03, /* message size */
+ 0x00, 0x01, 0x02, /* message body */
];
assert_eq_transport_written_bytes!(t, expected_bytes);
diff --git a/lib/rs/src/transport/mem.rs b/lib/rs/src/transport/mem.rs
index 86ac6bb..82c4b57 100644
--- a/lib/rs/src/transport/mem.rs
+++ b/lib/rs/src/transport/mem.rs
@@ -57,25 +57,17 @@
/// read buffer capacity and write buffer capacity.
pub fn with_capacity(read_capacity: usize, write_capacity: usize) -> TBufferChannel {
TBufferChannel {
- read: Arc::new(
- Mutex::new(
- ReadData {
- buf: vec![0; read_capacity].into_boxed_slice(),
- idx: 0,
- pos: 0,
- cap: read_capacity,
- },
- ),
- ),
- write: Arc::new(
- Mutex::new(
- WriteData {
- buf: vec![0; write_capacity].into_boxed_slice(),
- pos: 0,
- cap: write_capacity,
- },
- ),
- ),
+ read: Arc::new(Mutex::new(ReadData {
+ buf: vec![0; read_capacity].into_boxed_slice(),
+ idx: 0,
+ pos: 0,
+ cap: read_capacity,
+ })),
+ write: Arc::new(Mutex::new(WriteData {
+ buf: vec![0; write_capacity].into_boxed_slice(),
+ pos: 0,
+ cap: write_capacity,
+ })),
}
}
@@ -151,20 +143,20 @@
where
Self: Sized,
{
- Ok(
- (ReadHalf {
- handle: TBufferChannel {
- read: self.read.clone(),
- write: self.write.clone(),
- },
- },
- WriteHalf {
- handle: TBufferChannel {
- read: self.read.clone(),
- write: self.write.clone(),
- },
- }),
- )
+ Ok((
+ ReadHalf {
+ handle: TBufferChannel {
+ read: self.read.clone(),
+ write: self.write.clone(),
+ },
+ },
+ WriteHalf {
+ handle: TBufferChannel {
+ read: self.read.clone(),
+ write: self.write.clone(),
+ },
+ },
+ ))
}
}
diff --git a/lib/rs/src/transport/mod.rs b/lib/rs/src/transport/mod.rs
index 6e84bfa..a623350 100644
--- a/lib/rs/src/transport/mod.rs
+++ b/lib/rs/src/transport/mod.rs
@@ -29,32 +29,31 @@
#[cfg(test)]
macro_rules! assert_eq_transport_num_written_bytes {
- ($transport:ident, $num_written_bytes:expr) => {
- {
- assert_eq!($transport.channel.write_bytes().len(), $num_written_bytes);
- }
- };
+ ($transport:ident, $num_written_bytes:expr) => {{
+ assert_eq!($transport.channel.write_bytes().len(), $num_written_bytes);
+ }};
}
-
#[cfg(test)]
macro_rules! assert_eq_transport_written_bytes {
- ($transport:ident, $expected_bytes:ident) => {
- {
- assert_eq!($transport.channel.write_bytes(), &$expected_bytes);
- }
- };
+ ($transport:ident, $expected_bytes:ident) => {{
+ assert_eq!($transport.channel.write_bytes(), &$expected_bytes);
+ }};
}
mod buffered;
mod framed;
-mod socket;
mod mem;
+mod socket;
-pub use self::buffered::{TBufferedReadTransport, TBufferedReadTransportFactory,
- TBufferedWriteTransport, TBufferedWriteTransportFactory};
-pub use self::framed::{TFramedReadTransport, TFramedReadTransportFactory, TFramedWriteTransport,
- TFramedWriteTransportFactory};
+pub use self::buffered::{
+ TBufferedReadTransport, TBufferedReadTransportFactory, TBufferedWriteTransport,
+ TBufferedWriteTransportFactory,
+};
+pub use self::framed::{
+ TFramedReadTransport, TFramedReadTransportFactory, TFramedWriteTransport,
+ TFramedWriteTransportFactory,
+};
pub use self::mem::TBufferChannel;
pub use self::socket::TTcpChannel;
@@ -78,17 +77,9 @@
fn create(&self, channel: Box<Write + Send>) -> Box<TWriteTransport + Send>;
}
-impl<T> TReadTransport for T
-where
- T: Read,
-{
-}
+impl<T> TReadTransport for T where T: Read {}
-impl<T> TWriteTransport for T
-where
- T: Write,
-{
-}
+impl<T> TWriteTransport for T where T: Write {}
// FIXME: implement the Debug trait for boxed transports
diff --git a/lib/rs/src/transport/socket.rs b/lib/rs/src/transport/socket.rs
index 954e2f5..0bef67b 100644
--- a/lib/rs/src/transport/socket.rs
+++ b/lib/rs/src/transport/socket.rs
@@ -20,8 +20,8 @@
use std::io::{ErrorKind, Read, Write};
use std::net::{Shutdown, TcpStream};
-use {TransportErrorKind, new_transport_error};
use super::{ReadHalf, TIoChannel, WriteHalf};
+use {new_transport_error, TransportErrorKind};
/// Bidirectional TCP/IP channel.
///
@@ -76,18 +76,18 @@
/// The passed-in stream is assumed to have been opened before being wrapped
/// by the created `TTcpChannel` instance.
pub fn with_stream(stream: TcpStream) -> TTcpChannel {
- TTcpChannel { stream: Some(stream) }
+ TTcpChannel {
+ stream: Some(stream),
+ }
}
/// Connect to `remote_address`, which should have the form `host:port`.
pub fn open(&mut self, remote_address: &str) -> ::Result<()> {
if self.stream.is_some() {
- Err(
- new_transport_error(
- TransportErrorKind::AlreadyOpen,
- "tcp connection previously opened",
- ),
- )
+ Err(new_transport_error(
+ TransportErrorKind::AlreadyOpen,
+ "tcp connection previously opened",
+ ))
} else {
match TcpStream::connect(&remote_address) {
Ok(s) => {
@@ -112,11 +112,13 @@
where
F: FnMut(&mut TcpStream) -> io::Result<T>,
{
-
if let Some(ref mut s) = self.stream {
stream_operation(s)
} else {
- Err(io::Error::new(ErrorKind::NotConnected, "tcp endpoint not connected"),)
+ Err(io::Error::new(
+ ErrorKind::NotConnected,
+ "tcp endpoint not connected",
+ ))
}
}
}
@@ -131,21 +133,21 @@
s.stream
.as_mut()
.and_then(|s| s.try_clone().ok())
- .map(
- |cloned| {
- let read_half = ReadHalf::new( TTcpChannel { stream: s.stream.take() } );
- let write_half = WriteHalf::new( TTcpChannel { stream: Some(cloned) } );
- (read_half, write_half)
- },
- )
- .ok_or_else(
- || {
- new_transport_error(
- TransportErrorKind::Unknown,
- "cannot clone underlying tcp stream",
- )
- },
- )
+ .map(|cloned| {
+ let read_half = ReadHalf::new(TTcpChannel {
+ stream: s.stream.take(),
+ });
+ let write_half = WriteHalf::new(TTcpChannel {
+ stream: Some(cloned),
+ });
+ (read_half, write_half)
+ })
+ .ok_or_else(|| {
+ new_transport_error(
+ TransportErrorKind::Unknown,
+ "cannot clone underlying tcp stream",
+ )
+ })
}
}