Revert rust-fmt changes from 0814cbc

Author: dgburr

rust/sbp/examples/serial.rs

@@ -7,7 +7,7 @@ use std::time::Duration;
 
 use serialport::prelude::*;
 
-use sbp::{iter_messages, Sbp};
+use sbp::{Sbp, iter_messages};
 
 fn main() {
     let s = SerialPortSettings {

rust/sbp/src/de.rs

@@ -11,8 +11,8 @@ use dencode::FramedRead;
 use futures::StreamExt;
 
 use crate::{
-    messages::{invalid::Invalid, SbpMsgParseError},
-    HandleParseError, Sbp, CRC_LEN, HEADER_LEN, MAX_FRAME_LEN, PAYLOAD_INDEX, PREAMBLE,
+    CRC_LEN, HEADER_LEN, HandleParseError, MAX_FRAME_LEN, PAYLOAD_INDEX, PREAMBLE, Sbp,
+    messages::{SbpMsgParseError, invalid::Invalid},
 };
 
 /// Deserialize the IO stream into an iterator of messages.

rust/sbp/src/json/de.rs

@@ -1,15 +1,15 @@
 use std::io;
 
-use base64::{prelude::BASE64_STANDARD, Engine};
+use base64::{Engine, prelude::BASE64_STANDARD};
 use bytes::{Buf, BytesMut};
 use dencode::{Decoder, FramedRead};
 use serde::de::DeserializeOwned;
 use serde_json::Deserializer;
 
 use crate::{
+    BUFLEN,
     json::{Json2JsonInput, JsonError, JsonInput},
     messages::Sbp,
-    BUFLEN,
 };
 
 /// Deserialize the IO stream into an iterator of messages.

rust/sbp/src/json/mod.rs

@@ -7,19 +7,19 @@ mod ser;
 use std::collections::HashMap;
 use std::io;
 
-use base64::{prelude::BASE64_STANDARD, Engine};
+use base64::{Engine, prelude::BASE64_STANDARD};
 use bytes::BytesMut;
 use serde::{Deserialize, Serialize};
-use serde_json::{ser::Formatter, Value};
+use serde_json::{Value, ser::Formatter};
 
 pub use serde_json::ser::CompactFormatter;
 
-use crate::{messages::invalid::Invalid, HandleParseError, Sbp};
+use crate::{HandleParseError, Sbp, messages::invalid::Invalid};
 #[cfg(feature = "async")]
 pub use de::stream_messages;
 pub use de::{iter_json2json_messages, iter_messages, iter_messages_from_fields};
 
-pub use ser::{to_vec, to_writer, Json2JsonEncoder, JsonEncoder};
+pub use ser::{Json2JsonEncoder, JsonEncoder, to_vec, to_writer};
 
 use crate::SbpMessage;
 pub use convert::JsonMap;

rust/sbp/src/json/ser.rs

@@ -1,18 +1,18 @@
 use std::{borrow::Borrow, convert::TryInto, io};
 
-use base64::{prelude::BASE64_STANDARD, Engine};
+use base64::{Engine, prelude::BASE64_STANDARD};
 use bytes::{BufMut, BytesMut};
 use dencode::{Encoder, FramedWrite, IterSinkExt};
 use serde::Serialize;
-use serde_json::{ser::Formatter, Serializer};
+use serde_json::{Serializer, ser::Formatter};
 
 use crate::{
+    BUFLEN, CRC_LEN, HEADER_LEN, MIN_FRAME_LEN, PREAMBLE, SbpMessage,
     json::{
         CommonJson, HaskellishFloatFormatter, Json2JsonInput, Json2JsonOutput, JsonError,
         JsonOutput,
     },
     messages::Sbp,
-    SbpMessage, BUFLEN, CRC_LEN, HEADER_LEN, MIN_FRAME_LEN, PREAMBLE,
 };
 
 const BASE64_BUFLEN: usize = BUFLEN * 4;

rust/sbp/src/lib.rs

@@ -193,7 +193,7 @@ pub use messages::Sbp;
 pub use crate::messages::SbpMessage;
 
 #[doc(inline)]
-pub use ser::{to_vec, to_writer, Error as SerializeError, SbpEncoder};
+pub use ser::{Error as SerializeError, SbpEncoder, to_vec, to_writer};
 
 #[doc(inline)]
 pub use de::{Error as DeserializeError, *};

rust/sbp/src/messages/invalid.rs

@@ -7,7 +7,7 @@
 
 use bytes::{Buf, BufMut};
 
-use crate::{de::CrcError, messages::SbpMsgParseError, wire_format::WireFormat, SbpMessage};
+use crate::{SbpMessage, de::CrcError, messages::SbpMsgParseError, wire_format::WireFormat};
 
 /// Invalid messages occur when either the frame or message payload doesn't have enough bytes or
 /// the CRC does not match the messages payload. If the message is well formed with a message

rust/sbp/src/messages/unknown.rs

@@ -2,7 +2,7 @@
 
 use bytes::{Buf, BufMut};
 
-use crate::{wire_format::WireFormat, SbpMessage};
+use crate::{SbpMessage, wire_format::WireFormat};
 
 /// The message returned by the parser when the message type does not correspond to a known message.
 ///

rust/sbp/src/sbp_iter_ext.rs

@@ -120,9 +120,9 @@ mod swiftnav_impl {
     use swiftnav::time::GpsTime;
 
     use crate::{
+        Frame, Sbp,
         messages::SbpMessage,
         time::{GpsTimeError, MessageTime, RoverTime},
-        Frame, Sbp,
     };
 
     /// See [SbpIterExt::with_rover_time] for more information.

rust/sbp/src/ser.rs

@@ -5,8 +5,8 @@ use bytes::BytesMut;
 use dencode::{Encoder, FramedWrite, IterSinkExt};
 
 use crate::wire_format::WireFormat;
-use crate::{Sbp, SbpMessage};
 use crate::{BUFLEN, MAX_PAYLOAD_LEN, PREAMBLE};
+use crate::{Sbp, SbpMessage};
 
 /// Serialize the given message into the IO stream.
 ///