Rework structured value casting

benches/value.rs

@@ -0,0 +1,38 @@
+#![cfg(feature = "kv_unstable")]
+#![feature(test)]
+
+extern crate test;
+extern crate log;
+
+use log::kv::Value;
+
+#[bench]
+fn u8_to_value(b: &mut test::Bencher) {
+    b.iter(|| {
+        Value::from(1u8)
+    })
+}
+
+#[bench]
+fn u8_to_value_debug(b: &mut test::Bencher) {
+    b.iter(|| {
+        Value::from_debug(&1u8)
+    })
+}
+
+#[bench]
+fn str_to_value_debug(b: &mut test::Bencher) {
+    b.iter(|| {
+        Value::from_debug(&"a string")
+    })
+}
+
+#[bench]
+fn custom_to_value_debug(b: &mut test::Bencher) {
+    #[derive(Debug)]
+    struct A;
+
+    b.iter(|| {
+        Value::from_debug(&A)
+    })
+}

build.rs

@@ -3,12 +3,21 @@
 
 use std::env;
 
+#[cfg(feature = "kv_unstable")]
+#[path = "src/kv/value/internal/cast/into_primitive.rs"]
+mod into_primitive;
+
 fn main() {
     let target = env::var("TARGET").unwrap();
 
     if !target.starts_with("thumbv6") {
         println!("cargo:rustc-cfg=atomic_cas");
     }
 
+    #[cfg(feature = "kv_unstable")]
+    into_primitive::generate();
+
+    println!("cargo:rustc-cfg=src_build");
+
     println!("cargo:rerun-if-changed=build.rs");
 }

src/kv/value/fill.rs

@@ -2,7 +2,7 @@
 
 use std::fmt;
 
-use super::internal::{Erased, Inner, Visitor};
+use super::internal::{Inner, Visitor};
 use super::{Error, Value};
 
 impl<'v> Value<'v> {
@@ -12,7 +12,7 @@ impl<'v> Value<'v> {
         T: Fill + 'static,
     {
         Value {
-            inner: Inner::Fill(unsafe { Erased::new_unchecked::<T>(value) }),
+            inner: Inner::Fill(value),
         }
     }
 }

src/kv/value/impls.rs

@@ -7,24 +7,6 @@ use std::fmt;
 
 use super::{Primitive, ToValue, Value};
 
-macro_rules! impl_into_owned {
-    ($($into_ty:ty => $convert:ident,)*) => {
-        $(
-            impl ToValue for $into_ty {
-                fn to_value(&self) -> Value {
-                    Value::from(*self)
-                }
-            }
-
-            impl<'v> From<$into_ty> for Value<'v> {
-                fn from(value: $into_ty) -> Self {
-                    Value::from_primitive(value as $convert)
-                }
-            }
-        )*
-    };
-}
-
 impl<'v> ToValue for &'v str {
     fn to_value(&self) -> Value {
         Value::from(*self)
@@ -67,24 +49,42 @@ where
     }
 }
 
-impl_into_owned! [
-    usize => u64,
-    u8 => u64,
-    u16 => u64,
-    u32 => u64,
-    u64 => u64,
+macro_rules! impl_to_value_primitive {
+    ($($into_ty:ty,)*) => {
+        $(
+            impl ToValue for $into_ty {
+                fn to_value(&self) -> Value {
+                    Value::from(*self)
+                }
+            }
+
+            impl<'v> From<$into_ty> for Value<'v> {
+                fn from(value: $into_ty) -> Self {
+                    Value::from_primitive(value)
+                }
+            }
+        )*
+    };
+}
+
+impl_to_value_primitive! [
+    usize,
+    u8,
+    u16,
+    u32,
+    u64,
 
-    isize => i64,
-    i8 => i64,
-    i16 => i64,
-    i32 => i64,
-    i64 => i64,
+    isize,
+    i8,
+    i16,
+    i32,
+    i64,
 
-    f32 => f64,
-    f64 => f64,
+    f32,
+    f64,
 
-    char => char,
-    bool => bool,
+    char,
+    bool,
 ];
 
 #[cfg(feature = "std")]

src/kv/value/internal/cast/into_primitive.rs

@@ -0,0 +1,109 @@
+// NOTE: With specialization we could potentially avoid this call using a blanket
+// `ToPrimitive` trait that defaults to `None` except for these specific types
+// It won't work with `&str` though in the `min_specialization` case
+#[cfg(src_build)]
+pub(in kv::value) fn into_primitive<'v>(value: &'v (dyn std::any::Any + 'static)) -> Option<crate::kv::value::internal::Primitive<'v>> {
+    // The set of type ids that map to primitives are generated at build-time
+    // by the contents of `sorted_type_ids.expr`. These type ids are pre-sorted
+    // so that they can be searched efficiently. See the `sorted_type_ids.expr.rs`
+    // file for the set of types that appear in this list
+    static TYPE_IDS: [(std::any::TypeId, for<'a> fn(&'a (dyn std::any::Any + 'static)) -> crate::kv::value::internal::Primitive<'a>); 30] = include!(concat!(env!("OUT_DIR"), "/into_primitive.rs"));
+
+    debug_assert!(TYPE_IDS.is_sorted_by_key(|&(k, _)| k));
+    if let Ok(i) = TYPE_IDS.binary_search_by_key(&value.type_id(), |&(k, _)| k) {
+        Some((TYPE_IDS[i].1)(value))
+    } else {
+        None
+    }
+}
+
+// When the `src_build` config is not set then we're in the build script
+// This function will generate an expression fragment used by `into_primitive`
+#[cfg(not(src_build))]
+pub fn generate() {
+    use std::path::Path;
+    use std::{fs, env};
+
+    macro_rules! type_ids {
+        ($($ty:ty,)*) => {
+            [
+                $(
+                    (
+                        std::any::TypeId::of::<$ty>(),
+                        stringify!(
+                            (
+                                std::any::TypeId::of::<$ty>(),
+                                (|value| unsafe {
+                                    debug_assert_eq!(value.type_id(), std::any::TypeId::of::<$ty>());
+
+                                    // SAFETY: We verify the value is $ty before casting
+                                    let value = *(value as *const dyn std::any::Any as *const $ty);
+                                    value.into()
+                                }) as for<'a> fn(&'a (dyn std::any::Any + 'static)) -> crate::kv::value::internal::Primitive<'a>
+                            )
+                        )
+                    ),
+                )*
+                $(
+                    (
+                        std::any::TypeId::of::<Option<$ty>>(),
+                        stringify!(
+                            (
+                                std::any::TypeId::of::<Option<$ty>>(),
+                                (|value| unsafe {
+                                    debug_assert_eq!(value.type_id(), std::any::TypeId::of::<Option<$ty>>());
+
+                                    // SAFETY: We verify the value is Option<$ty> before casting
+                                    let value = *(value as *const dyn std::any::Any as *const Option<$ty>);
+                                    if let Some(value) = value {
+                                        value.into()
+                                    } else {
+                                        crate::kv::value::internal::Primitive::None
+                                    }
+                                }) as for<'a> fn(&'a (dyn std::any::Any + 'static)) -> crate::kv::value::internal::Primitive<'a>
+                            )
+                        )
+                    ),
+                )*
+            ]
+        };
+    }
+
+    let mut type_ids = type_ids![
+        usize,
+        u8,
+        u16,
+        u32,
+        u64,
+
+        isize,
+        i8,
+        i16,
+        i32,
+        i64,
+
+        f32,
+        f64,
+
+        char,
+        bool,
+
+        &str,
+    ];
+
+    type_ids.sort_by_key(|&(k, _)| k);
+
+    let mut ordered_type_ids_expr = String::new();
+
+    ordered_type_ids_expr.push('[');
+
+    for (_, v) in &type_ids {
+        ordered_type_ids_expr.push_str(v);
+        ordered_type_ids_expr.push(',');
+    }
+
+    ordered_type_ids_expr.push(']');
+
+    let path = Path::new(&env::var_os("OUT_DIR").unwrap()).join("into_primitive.rs");
+    fs::write(path, ordered_type_ids_expr).unwrap();
+}