Remove custom MetaType and TypeId

src/build.rs

@@ -298,11 +298,12 @@ impl<T> FieldsBuilder<T> {
         self.fields
     }
 
-    fn push_field(&mut self, field: Field) {
+    fn push_field(mut self, field: Field) -> Self {
         // filter out fields of PhantomData
         if !field.ty().is_phantom() {
             self.fields.push(field);
         }
+        self
     }
 }
 
@@ -316,21 +317,7 @@ impl FieldsBuilder<NamedFields> {
             -> FieldBuilder<field_state::NameAssigned, field_state::TypeAssigned>,
     {
         let builder = builder(FieldBuilder::new());
-        let mut this = self;
-        this.push_field(builder.finalize());
-        this
-    }
-
-    /// Add a named field constructed using the builder.
-    pub fn field_mut<F>(&mut self, builder: F)
-    where
-        F: Fn(
-            FieldBuilder,
-        )
-            -> FieldBuilder<field_state::NameAssigned, field_state::TypeAssigned>,
-    {
-        let builder = builder(FieldBuilder::new());
-        self.push_field(builder.finalize());
+        self.push_field(builder.finalize())
     }
 }
 
@@ -344,9 +331,7 @@ impl FieldsBuilder<UnnamedFields> {
             -> FieldBuilder<field_state::NameNotAssigned, field_state::TypeAssigned>,
     {
         let builder = builder(FieldBuilder::new());
-        let mut this = self;
-        this.push_field(builder.finalize());
-        this
+        self.push_field(builder.finalize())
     }
 }
 

src/form.rs

@@ -29,12 +29,14 @@
 //! Other forms, such as a portable form that is still bound to the registry
 //! (also via lifetime tracking) are possible but current not needed.
 
-use crate::prelude::fmt::Debug;
+use crate::prelude::{
+    any::TypeId,
+    fmt::Debug,
+};
 
 use crate::{
     interner::UntrackedSymbol,
     meta_type::MetaType,
-    TypeId,
 };
 
 #[cfg(feature = "serde")]

src/lib.rs

@@ -355,25 +355,6 @@ pub use self::{
     ty::*,
 };
 
-/// todo: docs
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash, Ord, PartialOrd)]
-pub enum TypeId {
-    /// todo: docs
-    Rust(core::any::TypeId),
-    /// todo: docs
-    Custom(u64),
-}
-
-impl TypeId {
-    /// todo: docs
-    pub fn of<T>() -> Self
-    where
-        T: ?Sized + 'static,
-    {
-        Self::Rust(core::any::TypeId::of::<T>())
-    }
-}
-
 #[cfg(feature = "derive")]
 pub use scale_info_derive::TypeInfo;
 

src/meta_type.rs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 use crate::prelude::{
+    any::TypeId,
     cmp::Ordering,
     fmt::{
         Debug,
@@ -28,7 +29,6 @@ use crate::prelude::{
 use crate::{
     form::MetaForm,
     Type,
-    TypeId,
     TypeInfo,
 };
 
@@ -96,16 +96,6 @@ impl MetaType {
         }
     }
 
-    /// Creates a new meta type from the user supplied type id and type info function.
-    ///
-    /// NOTE: It is the responsibility of the caller to ensure unique type ids per custom type.
-    pub fn new_custom(type_id: u64, fn_type_info: fn() -> Type<MetaForm>) -> Self {
-        Self {
-            fn_type_info,
-            type_id: TypeId::Custom(type_id),
-        }
-    }
-
     /// Returns the meta type information.
     pub fn type_info(&self) -> Type<MetaForm> {
         (self.fn_type_info)()

src/registry.rs

@@ -24,6 +24,7 @@
 //! prelude types that live in the so-called root namespace which is empty.
 
 use crate::prelude::{
+    any::TypeId,
     collections::BTreeMap,
     fmt::Debug,
     vec::Vec,
@@ -37,7 +38,6 @@ use crate::{
     },
     meta_type::MetaType,
     Type,
-    TypeId,
 };
 use scale::Encode;
 
@@ -73,7 +73,7 @@ pub struct Registry {
     /// The database where registered types reside.
     ///
     /// The contents herein is used for serlialization.
-    types: BTreeMap<UntrackedSymbol<TypeId>, Type<PortableForm>>,
+    types: BTreeMap<UntrackedSymbol<core::any::TypeId>, Type<PortableForm>>,
 }
 
 impl Default for Registry {

src/tests.rs

@@ -366,17 +366,29 @@ fn basic_enum_with_index() {
 
 #[test]
 fn runtime_meta_type() {
-    let mut fields = Fields::named();
-    let custom_u32_id = 1;
-    let custom_u32_type_info = <u32 as TypeInfo>::type_info;
-    for i in 0..3 {
-        fields.field_mut(|f| {
-            f.ty_meta(MetaType::new_custom(custom_u32_id, custom_u32_type_info))
-                .name(i.to_string())
-                .type_name("custom_u32".to_string())
-        })
-    }
-    let _ty = TypeBuilder::default()
-        .path(Path::from_segments(vec!["MyCustomStruct".to_string()]).unwrap())
-        .composite(fields);
+    // let mut fields = Fields::named();
+    // let custom_u32_id = 1;
+    // let custom_u32_type_info = <u32 as TypeInfo>::type_info;
+    // let u32_meta_type = MetaType::new_custom(custom_u32_id, custom_u32_type_info);
+    // for i in 0..3 {
+    //     fields.field_mut(|f| {
+    //         f.ty_meta(u32_meta_type.clone())
+    //             .name(i.to_string())
+    //             .type_name("custom_u32".to_string())
+    //     })
+    // }
+    // // add array type
+    // let arr_type_id = 2;
+    // let arr_type_info = || Type::from(TypeDefArray::new(32, u32_meta_type.clone()));
+    // let arr_meta_type = MetaType::new_custom(arr_type_id, arr_type_info);
+    //
+    // fields.field_mut(|f| {
+    //     f.ty_meta(arr_meta_type)
+    //         .name("arr")
+    //         .type_name("custom_arr".to_string())
+    // });
+    //
+    // let _ty = TypeBuilder::default()
+    //     .path(Path::from_segments(vec!["MyCustomStruct".to_string()]).unwrap())
+    //     .composite(fields);
 }