From d5494e58a4cbbaaebca435a417819ff55e544f21 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Mon, 2 Sep 2019 21:12:09 +0200
Subject: [PATCH 1/7] ExtractType doesn't have to be implemented for Option any
 more

---
 src/object/types.rs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/object/types.rs b/src/object/types.rs
index 2f17ed6f03..7965c76023 100644
--- a/src/object/types.rs
+++ b/src/object/types.rs
@@ -15,19 +15,6 @@ impl<T> ExtractType for T {
         )))
     }
 }
-impl<T: ExtractType> ExtractType for Option<T> {
-    fn extract(value: &Tagged<Value>) -> Result<Option<T>, ShellError> {
-        let name = std::any::type_name::<T>();
-        trace!("<Option> Extracting {:?} for Option<{}>", value, name);
-
-        let result = match value.item() {
-            Value::Primitive(Primitive::Nothing) => None,
-            _ => Some(T::extract(value)?),
-        };
-
-        Ok(result)
-    }
-}
 
 impl<T: ExtractType> ExtractType for Tagged<T> {
     fn extract(value: &Tagged<Value>) -> Result<Tagged<T>, ShellError> {

From 9b3a561e830c58a06fd6878cfd19c937b2dbd630 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Mon, 2 Sep 2019 22:06:46 +0200
Subject: [PATCH 2/7] Small refactor

---
 src/parser/deserializer.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/parser/deserializer.rs b/src/parser/deserializer.rs
index 33e4b9ead2..a2ec8a96c6 100644
--- a/src/parser/deserializer.rs
+++ b/src/parser/deserializer.rs
@@ -300,15 +300,15 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut ConfigDeserializer<'de> {
             self.stack
         );
 
-        if self.saw_root {
-            let value = self.pop();
-            let name = std::any::type_name::<V::Value>();
-            trace!("Extracting {:?} for {:?}", value.val, name);
-            V::Value::extract(&value.val)
-        } else {
+        if !self.saw_root {
             self.saw_root = true;
-            visitor.visit_seq(StructDeserializer::new(&mut self, fields))
+            return visitor.visit_seq(StructDeserializer::new(&mut self, fields));
         }
+
+        let value = self.pop();
+        let name = std::any::type_name::<V::Value>();
+        trace!("Extracting {:?} for {:?}", value.val, name);
+        V::Value::extract(&value.val)
     }
     fn deserialize_enum<V>(
         self,

From e8880a1a5727ed1c06bc30704626a6084b5fb2ad Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Mon, 2 Sep 2019 22:30:51 +0200
Subject: [PATCH 3/7] Deserialize Block using serde

---
 src/object/types.rs        | 13 -------------
 src/parser/deserializer.rs | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/object/types.rs b/src/object/types.rs
index 7965c76023..ece1ba3bde 100644
--- a/src/object/types.rs
+++ b/src/object/types.rs
@@ -1,4 +1,3 @@
-use crate::object::base as value;
 use crate::prelude::*;
 use log::trace;
 
@@ -106,15 +105,3 @@ impl ExtractType for String {
         }
     }
 }
-
-impl ExtractType for value::Block {
-    fn extract(value: &Tagged<Value>) -> Result<value::Block, ShellError> {
-        match value {
-            Tagged {
-                item: Value::Block(block),
-                ..
-            } => Ok(block.clone()),
-            other => Err(ShellError::type_error("Block", other.tagged_type_name())),
-        }
-    }
-}
diff --git a/src/parser/deserializer.rs b/src/parser/deserializer.rs
index a2ec8a96c6..ea507128ef 100644
--- a/src/parser/deserializer.rs
+++ b/src/parser/deserializer.rs
@@ -306,6 +306,22 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut ConfigDeserializer<'de> {
         }
 
         let value = self.pop();
+
+        if name == "Block" {
+            let block = match value.val {
+                Tagged {
+                    item: Value::Block(block),
+                    ..
+                } => block,
+                other => return Err(ShellError::type_error("Block", other.tagged_type_name())),
+            };
+            let json = serde_json::to_string(&block)?;
+            let json_cursor = std::io::Cursor::new(json.into_bytes());
+            let mut json_de = serde_json::Deserializer::from_reader(json_cursor);
+            let r = json_de.deserialize_struct(name, fields, visitor)?;
+            return Ok(r);
+        }
+
         let name = std::any::type_name::<V::Value>();
         trace!("Extracting {:?} for {:?}", value.val, name);
         V::Value::extract(&value.val)

From 9ba2e75ac1722d8efd6679b4da0fa9e8691bd50b Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Mon, 2 Sep 2019 23:21:29 +0200
Subject: [PATCH 4/7] Move code into separate visit function

---
 src/parser/deserializer.rs | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/parser/deserializer.rs b/src/parser/deserializer.rs
index ea507128ef..c3d9370872 100644
--- a/src/parser/deserializer.rs
+++ b/src/parser/deserializer.rs
@@ -293,6 +293,22 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut ConfigDeserializer<'de> {
     where
         V: Visitor<'de>,
     {
+        fn visit<'de, T, V>(
+            val: T,
+            name: &'static str,
+            fields: &'static [&'static str],
+            visitor: V
+        ) -> Result<V::Value, ShellError>
+        where
+            T: serde::Serialize,
+            V: Visitor<'de>,
+        {
+            let json = serde_json::to_string(&val)?;
+            let json_cursor = std::io::Cursor::new(json.into_bytes());
+            let mut json_de = serde_json::Deserializer::from_reader(json_cursor);
+            let r = json_de.deserialize_struct(name, fields, visitor)?;
+            return Ok(r);
+        }
         trace!(
             "deserializing struct {:?} {:?} (stack={:?})",
             name,
@@ -315,11 +331,7 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut ConfigDeserializer<'de> {
                 } => block,
                 other => return Err(ShellError::type_error("Block", other.tagged_type_name())),
             };
-            let json = serde_json::to_string(&block)?;
-            let json_cursor = std::io::Cursor::new(json.into_bytes());
-            let mut json_de = serde_json::Deserializer::from_reader(json_cursor);
-            let r = json_de.deserialize_struct(name, fields, visitor)?;
-            return Ok(r);
+            return visit(block, name, fields, visitor);
         }
 
         let name = std::any::type_name::<V::Value>();

From cc8872b4eec3f39896ccb11d9c25a30a79c04dd7 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Mon, 2 Sep 2019 23:23:34 +0200
Subject: [PATCH 5/7] Use serde to deserialize Tagged<Value>

---
 src/object/types.rs        |  8 --------
 src/parser/deserializer.rs | 12 +++++++++---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/object/types.rs b/src/object/types.rs
index ece1ba3bde..913c43358a 100644
--- a/src/object/types.rs
+++ b/src/object/types.rs
@@ -24,14 +24,6 @@ impl<T: ExtractType> ExtractType for Tagged<T> {
     }
 }
 
-impl ExtractType for Value {
-    fn extract(value: &Tagged<Value>) -> Result<Value, ShellError> {
-        trace!("<Tagged> Extracting {:?} for Value", value);
-
-        Ok(value.item().clone())
-    }
-}
-
 impl ExtractType for bool {
     fn extract(value: &Tagged<Value>) -> Result<bool, ShellError> {
         trace!("Extracting {:?} for bool", value);
diff --git a/src/parser/deserializer.rs b/src/parser/deserializer.rs
index c3d9370872..1b5f34bfda 100644
--- a/src/parser/deserializer.rs
+++ b/src/parser/deserializer.rs
@@ -323,6 +323,13 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut ConfigDeserializer<'de> {
 
         let value = self.pop();
 
+        let type_name = std::any::type_name::<V::Value>();
+        let tagged_val_name = std::any::type_name::<Tagged<Value>>();
+
+        if name == tagged_val_name {
+            return visit::<Tagged<Value>, _>(value.val, name, fields, visitor);
+        }
+
         if name == "Block" {
             let block = match value.val {
                 Tagged {
@@ -331,11 +338,10 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut ConfigDeserializer<'de> {
                 } => block,
                 other => return Err(ShellError::type_error("Block", other.tagged_type_name())),
             };
-            return visit(block, name, fields, visitor);
+            return visit::<value::Block, _>(block, name, fields, visitor);
         }
 
-        let name = std::any::type_name::<V::Value>();
-        trace!("Extracting {:?} for {:?}", value.val, name);
+        trace!("Extracting {:?} for {:?}", value.val, type_name);
         V::Value::extract(&value.val)
     }
     fn deserialize_enum<V>(

From 225ef8e75d9af01b1fc8f372ef9001916a5fcbfb Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Tue, 3 Sep 2019 02:10:48 +0200
Subject: [PATCH 6/7] Use serde to deserialize the remaining things

---
 src/parser/deserializer.rs | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/parser/deserializer.rs b/src/parser/deserializer.rs
index 1b5f34bfda..836b6a02b1 100644
--- a/src/parser/deserializer.rs
+++ b/src/parser/deserializer.rs
@@ -1,6 +1,7 @@
 use crate::prelude::*;
 use log::trace;
 use serde::de;
+use std::path::PathBuf;
 
 #[derive(Debug)]
 pub struct DeserializerItem<'de> {
@@ -342,7 +343,35 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut ConfigDeserializer<'de> {
         }
 
         trace!("Extracting {:?} for {:?}", value.val, type_name);
-        V::Value::extract(&value.val)
+
+        let tag = value.val.tag();
+        match value.val {
+            Tagged {
+                item: Value::Primitive(Primitive::Boolean(b)),
+                ..
+            } => visit::<Tagged<bool>, _>(b.tagged(tag), name, fields, visitor),
+            Tagged {
+                item: Value::Primitive(Primitive::Nothing),
+                ..
+            } => visit::<Tagged<bool>, _>(false.tagged(tag), name, fields, visitor),
+            Tagged {
+                item: Value::Primitive(Primitive::Path(p)),
+                ..
+            } => visit::<Tagged<PathBuf>, _>(p.clone().tagged(tag), name, fields, visitor),
+            Tagged {
+                item: Value::Primitive(Primitive::Int(int)),
+                ..
+            } => {
+                let i: i64 = int.tagged(value.val.tag).coerce_into("converting to i64")?;
+                visit::<Tagged<i64>, _>(i.tagged(tag), name, fields, visitor)
+            },
+            Tagged {
+                item: Value::Primitive(Primitive::String(string)),
+                ..
+            } => visit::<Tagged<String>, _>(string.tagged(tag), name, fields, visitor),
+
+            other => return Err(ShellError::type_error(name, other.tagged_type_name())),
+        }
     }
     fn deserialize_enum<V>(
         self,

From 35d576f540005167eb84d11bf08c4978484742e1 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Tue, 3 Sep 2019 02:13:41 +0200
Subject: [PATCH 7/7] Remove use of specialization

---
 src/lib.rs          |  1 -
 src/object/types.rs | 10 ----------
 2 files changed, 11 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 7a82741199..2e9b8fb061 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,4 @@
 #![feature(generators)]
-#![feature(specialization)]
 #![feature(proc_macro_hygiene)]
 
 #[macro_use]
diff --git a/src/object/types.rs b/src/object/types.rs
index 913c43358a..8dca43d878 100644
--- a/src/object/types.rs
+++ b/src/object/types.rs
@@ -5,16 +5,6 @@ pub trait ExtractType: Sized {
     fn extract(value: &Tagged<Value>) -> Result<Self, ShellError>;
 }
 
-impl<T> ExtractType for T {
-    default fn extract(_value: &Tagged<Value>) -> Result<T, ShellError> {
-        let name = std::any::type_name::<T>();
-        Err(ShellError::unimplemented(format!(
-            "<T> ExtractType for {}",
-            name
-        )))
-    }
-}
-
 impl<T: ExtractType> ExtractType for Tagged<T> {
     fn extract(value: &Tagged<Value>) -> Result<Tagged<T>, ShellError> {
         let name = std::any::type_name::<T>();