From 3f5e431717cbe3ab2be08379a082e7eb80f6272a Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Mon, 25 May 2020 15:40:01 +0200
Subject: [PATCH] Clean up error situation

---
 implementations/rust/src/value/codec.rs   | 4 ++--
 implementations/rust/src/value/decoder.rs | 2 +-
 implementations/rust/src/value/encoder.rs | 2 +-
 implementations/rust/src/value/error.rs   | 1 -
 implementations/rust/src/value/reader.rs  | 3 +--
 implementations/rust/src/value/writer.rs  | 2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/implementations/rust/src/value/codec.rs b/implementations/rust/src/value/codec.rs
index 2bd6802..8e71bdb 100644
--- a/implementations/rust/src/value/codec.rs
+++ b/implementations/rust/src/value/codec.rs
@@ -1,9 +1,9 @@
-use std::io::{Read, Write};
+use std::io::{Read, Write, Error};
 use super::{
     decoder::{self, Decoder, DecodePlaceholderMap},
     encoder::{Encoder, EncodePlaceholderMap},
     invert_map,
-    reader::{BinaryReader, Error, is_eof_error},
+    reader::{BinaryReader, is_eof_error},
     value::{
         NestedValue, Domain,
     },
diff --git a/implementations/rust/src/value/decoder.rs b/implementations/rust/src/value/decoder.rs
index 824552b..5d9a4e9 100644
--- a/implementations/rust/src/value/decoder.rs
+++ b/implementations/rust/src/value/decoder.rs
@@ -1,7 +1,7 @@
 use super::reader::{Reader, is_eof_error};
 use super::value::{NestedValue, Domain};
 
-pub use super::reader::{Error, Result, DecodePlaceholderMap};
+pub use super::reader::{Result, DecodePlaceholderMap};
 
 pub struct Decoder<'a, R: Reader, N: NestedValue<Dom>, Dom: Domain> {
     pub read: R,
diff --git a/implementations/rust/src/value/encoder.rs b/implementations/rust/src/value/encoder.rs
index c9d5eb0..3cc716e 100644
--- a/implementations/rust/src/value/encoder.rs
+++ b/implementations/rust/src/value/encoder.rs
@@ -1,7 +1,7 @@
 use super::value::{Value, NestedValue, Float, Double, Map, Domain};
 use super::writer::Writer;
 
-pub use super::writer::{Error, Result};
+pub use super::writer::Result;
 
 pub type EncodePlaceholderMap<N, D> = Map<Value<N, D>, usize>;
 
diff --git a/implementations/rust/src/value/error.rs b/implementations/rust/src/value/error.rs
index 188a969..55af256 100644
--- a/implementations/rust/src/value/error.rs
+++ b/implementations/rust/src/value/error.rs
@@ -8,7 +8,6 @@ pub enum Error<D: Domain> {
     NumberTooLarge(BigInt),
     CannotDeserializeAny,
     Expected(ExpectedKind, PlainValue<D>),
-    InternalMagicError,
 }
 
 #[derive(Debug)]
diff --git a/implementations/rust/src/value/reader.rs b/implementations/rust/src/value/reader.rs
index c1309a6..e270def 100644
--- a/implementations/rust/src/value/reader.rs
+++ b/implementations/rust/src/value/reader.rs
@@ -1,11 +1,10 @@
 use num::bigint::BigInt;
 use std::convert::TryFrom;
 use std::convert::TryInto;
-use std::io::Read;
+use std::io::{Read, Error};
 use super::constants::{Op, InvalidOp, AtomMinor, CompoundMinor};
 use super::value::{Value, Domain, NestedValue, Map, Set};
 
-pub type Error = std::io::Error;
 pub type Result<T> = std::result::Result<T, Error>;
 
 #[derive(Debug)]
diff --git a/implementations/rust/src/value/writer.rs b/implementations/rust/src/value/writer.rs
index 9e2191d..81e2a46 100644
--- a/implementations/rust/src/value/writer.rs
+++ b/implementations/rust/src/value/writer.rs
@@ -1,9 +1,9 @@
 use num::bigint::BigInt;
 use num::cast::ToPrimitive;
 use std::convert::TryInto;
+use std::io::Error;
 use super::constants::{Op, AtomMinor, CompoundMinor};
 
-pub type Error = std::io::Error;
 pub type Result = std::result::Result<(), Error>;
 
 pub trait Writer {