From 8af4713237b34ef9cb580c1a0b27a016949f8c50 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Sat, 24 Aug 2019 10:06:19 +0200
Subject: [PATCH] Replace type_name intrinsic by stable type_name

---
 src/lib.rs                 |  1 -
 src/object/types.rs        | 12 ++++++------
 src/parser/deserializer.rs |  4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 41185bbc5c..a9ef8740f4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,7 +3,6 @@
 #![feature(generators)]
 #![feature(try_trait)]
 #![feature(bind_by_move_pattern_guards)]
-#![feature(core_intrinsics)]
 #![feature(option_flattening)]
 #![feature(specialization)]
 #![feature(proc_macro_hygiene)]
diff --git a/src/object/types.rs b/src/object/types.rs
index 8177f23ffd..719a990ad0 100644
--- a/src/object/types.rs
+++ b/src/object/types.rs
@@ -14,7 +14,7 @@ pub trait ExtractType: Sized {
 
 impl<T> ExtractType for T {
     default fn extract(_value: &Tagged<Value>) -> Result<T, ShellError> {
-        let name = std::intrinsics::type_name::<T>();
+        let name = std::any::type_name::<T>();
         Err(ShellError::unimplemented(format!(
             "<T> ExtractType for {}",
             name
@@ -32,7 +32,7 @@ impl<T> ExtractType for T {
 
 impl<T: ExtractType> ExtractType for Vec<Tagged<T>> {
     fn extract(value: &Tagged<Value>) -> Result<Self, ShellError> {
-        let name = std::intrinsics::type_name::<T>();
+        let name = std::any::type_name::<T>();
         trace!("<Vec> Extracting {:?} for Vec<{}>", value, name);
 
         match value.item() {
@@ -69,8 +69,8 @@ impl<T: ExtractType> ExtractType for Vec<Tagged<T>> {
 
 impl<T: ExtractType, U: ExtractType> ExtractType for (T, U) {
     fn extract(value: &Tagged<Value>) -> Result<(T, U), ShellError> {
-        let t_name = std::intrinsics::type_name::<T>();
-        let u_name = std::intrinsics::type_name::<U>();
+        let t_name = std::any::type_name::<T>();
+        let u_name = std::any::type_name::<U>();
 
         trace!("Extracting {:?} for ({}, {})", value, t_name, u_name);
 
@@ -98,7 +98,7 @@ impl<T: ExtractType, U: ExtractType> ExtractType for (T, U) {
 
 impl<T: ExtractType> ExtractType for Option<T> {
     fn extract(value: &Tagged<Value>) -> Result<Option<T>, ShellError> {
-        let name = std::intrinsics::type_name::<T>();
+        let name = std::any::type_name::<T>();
         trace!("<Option> Extracting {:?} for Option<{}>", value, name);
 
         let result = match value.item() {
@@ -123,7 +123,7 @@ impl<T: ExtractType> ExtractType for Option<T> {
 
 impl<T: ExtractType> ExtractType for Tagged<T> {
     fn extract(value: &Tagged<Value>) -> Result<Tagged<T>, ShellError> {
-        let name = std::intrinsics::type_name::<T>();
+        let name = std::any::type_name::<T>();
         trace!("<Tagged> Extracting {:?} for Tagged<{}>", value, name);
 
         Ok(T::extract(value)?.tagged(value.tag()))
diff --git a/src/parser/deserializer.rs b/src/parser/deserializer.rs
index b2cc00ac62..ff00a6142e 100644
--- a/src/parser/deserializer.rs
+++ b/src/parser/deserializer.rs
@@ -70,7 +70,7 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut ConfigDeserializer<'de> {
         V: Visitor<'de>,
     {
         let value = self.pop();
-        let name = std::intrinsics::type_name::<V::Value>();
+        let name = std::any::type_name::<V::Value>();
         trace!("<Deserialize any> Extracting {:?}", name);
 
         V::Value::extract(&value.val)
@@ -237,7 +237,7 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut ConfigDeserializer<'de> {
 
         if self.saw_root {
             let value = self.pop();
-            let name = std::intrinsics::type_name::<V::Value>();
+            let name = std::any::type_name::<V::Value>();
             trace!("Extracting {:?} for {:?}", value.val, name);
             V::Value::extract(&value.val)
         } else {