Incapsulate validation of UserTypeRef in the method

Author: Mingun

src/model/mod.rs

@@ -763,12 +763,7 @@ impl TypeRef {
           enum_: e.transpose()?,
         }),
         AttrType::User { name, args } => if let None = e {
-          Ok(TypeRef::User(UserTypeRef {
-            //TODO: resolve relative types
-            path: name.scope.path.into_iter().map(TypeName::valid).collect(),
-            name: TypeName::valid(name.name),
-            args: OwningNode::validate_all(args)?,
-          }))
+          Ok(TypeRef::User(UserTypeRef::validate(name, args)?))
         } else {
           enum_err()
         }

src/model/type.rs

@@ -8,6 +8,7 @@ use crate::error::ModelError;
 use crate::model::expressions::OwningNode;
 use crate::model::{Attribute, Enum, EnumName, SeqName, TypeName};
 use crate::parser as p;
+use crate::parser::expressions::{Node, TypeName as TName};
 
 /// Reference to a user-defined type name with an optional parameters.
 #[derive(Clone, Debug, Default, PartialEq)]
@@ -19,6 +20,16 @@ pub struct UserTypeRef {
   /// Optional arguments for type
   pub args: Vec<OwningNode>,
 }
+impl UserTypeRef {
+  pub(crate) fn validate(name: TName, args: Vec<Node>) -> Result<Self, ModelError> {
+    Ok(Self {
+      //TODO: resolve relative types
+      path: name.scope.path.into_iter().map(TypeName::valid).collect(),
+      name: TypeName::valid(name.name),
+      args: OwningNode::validate_all(args)?,
+    })
+  }
+}
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////