From 7448b7bb87a9467a54609726bf42f7d00ae44e71 Mon Sep 17 00:00:00 2001
From: Victor Koenders <gpg@trangar.com>
Date: Sun, 19 Sep 2021 08:34:14 +0200
Subject: [PATCH] Moved Encoder to its own file

---
 src/enc/encoder.rs | 85 ++++++++++++++++++++++++++++++++++++++++++
 src/enc/mod.rs     | 92 +++-------------------------------------------
 2 files changed, 91 insertions(+), 86 deletions(-)
 create mode 100644 src/enc/encoder.rs

diff --git a/src/enc/encoder.rs b/src/enc/encoder.rs
new file mode 100644
index 0000000..6f7ea95
--- /dev/null
+++ b/src/enc/encoder.rs
@@ -0,0 +1,85 @@
+use super::write::Writer;
+use super::Encode;
+use crate::{config::Config, error::Error, int_encoding::IntEncoding};
+use core::marker::PhantomData;
+
+pub struct Encoder<W: Writer, C: Config> {
+    writer: W,
+    config: PhantomData<C>,
+}
+
+impl<W: Writer, C: Config> Encoder<W, C> {
+    pub fn new(writer: W) -> Encoder<W, C> {
+        Encoder {
+            writer,
+            config: PhantomData,
+        }
+    }
+
+    pub fn into_writer(self) -> W {
+        self.writer
+    }
+}
+
+impl<'a, W: Writer, C: Config> Encode for &'a mut Encoder<W, C> {
+    fn encode_u8(&mut self, val: u8) -> Result<(), Error> {
+        self.writer.write(&[val])
+    }
+
+    fn encode_u16(&mut self, val: u16) -> Result<(), Error> {
+        <C::IntEncoding as IntEncoding>::int_encode_u16(&mut self.writer, C::ENDIAN, val)
+    }
+
+    fn encode_u32(&mut self, val: u32) -> Result<(), Error> {
+        <C::IntEncoding as IntEncoding>::int_encode_u32(&mut self.writer, C::ENDIAN, val)
+    }
+
+    fn encode_u64(&mut self, val: u64) -> Result<(), Error> {
+        <C::IntEncoding as IntEncoding>::int_encode_u64(&mut self.writer, C::ENDIAN, val)
+    }
+
+    fn encode_u128(&mut self, val: u128) -> Result<(), Error> {
+        <C::IntEncoding as IntEncoding>::int_encode_u128(&mut self.writer, C::ENDIAN, val)
+    }
+
+    fn encode_usize(&mut self, val: usize) -> Result<(), Error> {
+        <C::IntEncoding as IntEncoding>::int_encode_usize(&mut self.writer, C::ENDIAN, val)
+    }
+
+    fn encode_i8(&mut self, val: i8) -> Result<(), Error> {
+        self.writer.write(&[val as u8])
+    }
+
+    fn encode_i16(&mut self, val: i16) -> Result<(), Error> {
+        <C::IntEncoding as IntEncoding>::int_encode_i16(&mut self.writer, C::ENDIAN, val)
+    }
+
+    fn encode_i32(&mut self, val: i32) -> Result<(), Error> {
+        <C::IntEncoding as IntEncoding>::int_encode_i32(&mut self.writer, C::ENDIAN, val)
+    }
+
+    fn encode_i64(&mut self, val: i64) -> Result<(), Error> {
+        <C::IntEncoding as IntEncoding>::int_encode_i64(&mut self.writer, C::ENDIAN, val)
+    }
+
+    fn encode_i128(&mut self, val: i128) -> Result<(), Error> {
+        <C::IntEncoding as IntEncoding>::int_encode_i128(&mut self.writer, C::ENDIAN, val)
+    }
+
+    fn encode_isize(&mut self, val: isize) -> Result<(), Error> {
+        <C::IntEncoding as IntEncoding>::int_encode_isize(&mut self.writer, C::ENDIAN, val)
+    }
+
+    fn encode_f32(&mut self, val: f32) -> Result<(), Error> {
+        <C::IntEncoding as IntEncoding>::int_encode_f32(&mut self.writer, C::ENDIAN, val)
+    }
+
+    fn encode_f64(&mut self, val: f64) -> Result<(), Error> {
+        <C::IntEncoding as IntEncoding>::int_encode_f64(&mut self.writer, C::ENDIAN, val)
+    }
+
+    fn encode_slice(&mut self, val: &[u8]) -> Result<(), Error> {
+        // TODO: Should this be swapped if we're big or little endian?
+        self.writer.write(val)
+    }
+}
diff --git a/src/enc/mod.rs b/src/enc/mod.rs
index b7cb40f..0d1906d 100644
--- a/src/enc/mod.rs
+++ b/src/enc/mod.rs
@@ -1,11 +1,12 @@
-use core::marker::PhantomData;
-
-use crate::{config::Config, error::Error, int_encoding::IntEncoding};
-use write::Writer;
-
+mod encoder;
 mod impls;
+
+use crate::error::Error;
+
 pub mod write;
 
+pub use self::encoder::Encoder;
+
 pub trait Encodeable {
     fn encode<E: Encode>(&self, encoder: E) -> Result<(), Error>;
 }
@@ -29,84 +30,3 @@ pub trait Encode {
     fn encode_f64(&mut self, val: f64) -> Result<(), Error>;
     fn encode_slice(&mut self, val: &[u8]) -> Result<(), Error>;
 }
-
-pub struct Encoder<W: Writer, C: Config> {
-    writer: W,
-    config: PhantomData<C>,
-}
-
-impl<W: Writer, C: Config> Encoder<W, C> {
-    pub fn new(writer: W) -> Encoder<W, C> {
-        Encoder {
-            writer,
-            config: PhantomData,
-        }
-    }
-
-    pub fn into_writer(self) -> W {
-        self.writer
-    }
-}
-
-impl<'a, W: Writer, C: Config> Encode for &'a mut Encoder<W, C> {
-    fn encode_u8(&mut self, val: u8) -> Result<(), Error> {
-        self.writer.write(&[val])
-    }
-
-    fn encode_u16(&mut self, val: u16) -> Result<(), Error> {
-        <C::IntEncoding as IntEncoding>::int_encode_u16(&mut self.writer, C::ENDIAN, val)
-    }
-
-    fn encode_u32(&mut self, val: u32) -> Result<(), Error> {
-        <C::IntEncoding as IntEncoding>::int_encode_u32(&mut self.writer, C::ENDIAN, val)
-    }
-
-    fn encode_u64(&mut self, val: u64) -> Result<(), Error> {
-        <C::IntEncoding as IntEncoding>::int_encode_u64(&mut self.writer, C::ENDIAN, val)
-    }
-
-    fn encode_u128(&mut self, val: u128) -> Result<(), Error> {
-        <C::IntEncoding as IntEncoding>::int_encode_u128(&mut self.writer, C::ENDIAN, val)
-    }
-
-    fn encode_usize(&mut self, val: usize) -> Result<(), Error> {
-        <C::IntEncoding as IntEncoding>::int_encode_usize(&mut self.writer, C::ENDIAN, val)
-    }
-
-    fn encode_i8(&mut self, val: i8) -> Result<(), Error> {
-        self.writer.write(&[val as u8])
-    }
-
-    fn encode_i16(&mut self, val: i16) -> Result<(), Error> {
-        <C::IntEncoding as IntEncoding>::int_encode_i16(&mut self.writer, C::ENDIAN, val)
-    }
-
-    fn encode_i32(&mut self, val: i32) -> Result<(), Error> {
-        <C::IntEncoding as IntEncoding>::int_encode_i32(&mut self.writer, C::ENDIAN, val)
-    }
-
-    fn encode_i64(&mut self, val: i64) -> Result<(), Error> {
-        <C::IntEncoding as IntEncoding>::int_encode_i64(&mut self.writer, C::ENDIAN, val)
-    }
-
-    fn encode_i128(&mut self, val: i128) -> Result<(), Error> {
-        <C::IntEncoding as IntEncoding>::int_encode_i128(&mut self.writer, C::ENDIAN, val)
-    }
-
-    fn encode_isize(&mut self, val: isize) -> Result<(), Error> {
-        <C::IntEncoding as IntEncoding>::int_encode_isize(&mut self.writer, C::ENDIAN, val)
-    }
-
-    fn encode_f32(&mut self, val: f32) -> Result<(), Error> {
-        <C::IntEncoding as IntEncoding>::int_encode_f32(&mut self.writer, C::ENDIAN, val)
-    }
-
-    fn encode_f64(&mut self, val: f64) -> Result<(), Error> {
-        <C::IntEncoding as IntEncoding>::int_encode_f64(&mut self.writer, C::ENDIAN, val)
-    }
-
-    fn encode_slice(&mut self, val: &[u8]) -> Result<(), Error> {
-        // TODO: Should this be swapped if we're big or little endian?
-        self.writer.write(val)
-    }
-}