1 files changed, 41 insertions, 36 deletions

diff --git a/internals/src/bind/encoded_word/impls.rs b/internals/src/bind/encoded_word/impls.rs
index f7051da..af2582c 100644
--- a/internals/src/bind/encoded_word/impls.rs
+++ b/internals/src/bind/encoded_word/impls.rs
@@ -1,23 +1,27 @@
-use soft_ascii_string::{ SoftAsciiString, SoftAsciiChar, SoftAsciiStr };
+use soft_ascii_string::{SoftAsciiChar, SoftAsciiStr, SoftAsciiString};
 
+use super::{EncodedWordEncoding as Encoding, EncodedWordWriter};
+use encoder::EncodingWriter;
+use grammar::encoded_word::{ECW_SEP_OVERHEAD, MAX_ECW_LEN};
 use vec1::Vec1;
-use grammar::encoded_word::{ MAX_ECW_LEN, ECW_SEP_OVERHEAD };
-use ::encoder::EncodingWriter;
-use super::{ EncodedWordWriter, EncodedWordEncoding as Encoding };
 
 pub struct VecWriter<'a> {
-    data: Vec1<SoftAsciiString >,
+    data: Vec1<SoftAsciiString>,
     charset: &'a SoftAsciiStr,
-    encoding: Encoding
+    encoding: Encoding,
 }
 
 impl<'a> VecWriter<'a> {
     pub fn new(charset: &'a SoftAsciiStr, encoding: Encoding) -> Self {
-        let data = Vec1::new( SoftAsciiString::new() );
-        VecWriter { data, charset, encoding }
+        let data = Vec1::new(SoftAsciiString::new());
+        VecWriter {
+            data,
+            charset,
+            encoding,
+        }
     }
 
-    pub fn data( &self ) -> &[SoftAsciiString] {
+    pub fn data(&self) -> &[SoftAsciiString] {
         &*self.data
     }
 }
@@ -29,70 +33,71 @@ impl<'a> Into<Vec1<SoftAsciiString>> for VecWriter<'a> {
 }
 
 impl<'a> EncodedWordWriter for VecWriter<'a> {
-
-    fn encoding( &self ) -> Encoding {
+    fn encoding(&self) -> Encoding {
         self.encoding
     }
 
-    fn write_char( &mut self, ch: SoftAsciiChar ) {
-        self.data.last_mut().push( ch );
+    fn write_char(&mut self, ch: SoftAsciiChar) {
+        self.data.last_mut().push(ch);
     }
 
-    fn write_charset( &mut self ) {
-        self.data.last_mut().extend( self.charset.chars() )
+    fn write_charset(&mut self) {
+        self.data.last_mut().extend(self.charset.chars())
     }
 
-    fn write_ecw_seperator( &mut self ) {
-        self.data.push( SoftAsciiString::new() )
+    fn write_ecw_seperator(&mut self) {
+        self.data.push(SoftAsciiString::new())
     }
 
-    fn max_payload_len( &self ) -> usize {
+    fn max_payload_len(&self) -> usize {
         MAX_ECW_LEN - ECW_SEP_OVERHEAD - self.charset.len() - 1
     }
 }
 
-pub struct WriterWrapper<'a, 'b: 'a>{
+pub struct WriterWrapper<'a, 'b: 'a> {
     charset: &'a SoftAsciiStr,
     encoding: Encoding,
-    encoder_handle: &'a mut EncodingWriter<'b>
+    encoder_handle: &'a mut EncodingWriter<'b>,
 }
 
 impl<'a, 'b: 'a> WriterWrapper<'a, 'b> {
-    pub fn new_with_charset(charset: &'a SoftAsciiStr,
-                            encoding: Encoding,
-                            encoder: &'a mut EncodingWriter<'b> ) -> Self
-    {
-        WriterWrapper { charset, encoding, encoder_handle: encoder }
+    pub fn new_with_charset(
+        charset: &'a SoftAsciiStr,
+        encoding: Encoding,
+        encoder: &'a mut EncodingWriter<'b>,
+    ) -> Self {
+        WriterWrapper {
+            charset,
+            encoding,
+            encoder_handle: encoder,
+        }
     }
 
-    pub fn new(encoding: Encoding,
-               encoder: &'a mut EncodingWriter<'b> ) -> Self
-    {
+    pub fn new(encoding: Encoding, encoder: &'a mut EncodingWriter<'b>) -> Self {
         Self::new_with_charset(SoftAsciiStr::from_unchecked("utf8"), encoding, encoder)
     }
 }
 
 impl<'a, 'b: 'a> EncodedWordWriter for WriterWrapper<'a, 'b> {
-
-    fn encoding( &self ) -> Encoding {
+    fn encoding(&self) -> Encoding {
         self.encoding
     }
 
-    fn write_charset( &mut self ) {
+    fn write_charset(&mut self) {
         //TODO fix
-        let _ = self.encoder_handle.write_str( self.charset );
+        let _ = self.encoder_handle.write_str(self.charset);
     }
 
-    fn write_ecw_seperator( &mut self ) {
+    fn write_ecw_seperator(&mut self) {
         self.encoder_handle.write_fws();
     }
 
-    fn write_char( &mut self, ch: SoftAsciiChar ) {
+    fn write_char(&mut self, ch: SoftAsciiChar) {
         //TODO fix
-        let _ = self.encoder_handle.write_char( ch );
+        let _ = self.encoder_handle.write_char(ch);
     }
 
-    fn max_payload_len( &self ) -> usize {
+    fn max_payload_len(&self) -> usize {
         MAX_ECW_LEN - ECW_SEP_OVERHEAD - self.charset.len() - 1
     }
 }