diff --git a/sdk-builder/src/main.rs b/sdk-builder/src/main.rs index 9f00bd3..ab64de5 100644 --- a/sdk-builder/src/main.rs +++ b/sdk-builder/src/main.rs @@ -335,14 +335,6 @@ pub mod rust { }) } - /// returns the absolute path of a type with the assumption that all - /// packages are children of the path `crate::sdk` - fn get_type_path(&self, key: &ObjectRef) -> Option { - let pkg = &self.sdk.packages.get(&key.package)?.name; - self.get_type_name(key) - .map(|name| format!("crate::sdk::{pkg}::{name}")) - } - /// returns the precached, prefixed and cannonicalized (for this /// language, Rust) `Ident` for this object-ref fn get_type_ident(&self, key: &ObjectRef) -> Option { @@ -481,71 +473,6 @@ pub mod rust { Ok(()) } - fn type_name(&self, ty: &Type) -> anyhow::Result { - let type_name = match ty { - Type::Ptr(inner) | Type::Ref(inner) => { - format!( - "::core::option::Option>", - self.type_name(&inner)? - ) - } - Type::WeakPtr(inner) => { - format!( - "crate::engine::TWeakObjectPtr<{}>", - self.get_type_path(inner) - .context("type name was not cached.")? - ) - } - Type::SoftPtr(inner) => { - format!( - "crate::engine::TSoftObjectPtr<{}>", - self.get_type_path(inner) - .context("type name was not cached.")? - ) - } - Type::LazyPtr(inner) => { - format!( - "crate::engine::TLazyObjectPtr<{}>", - self.get_type_path(inner) - .context("type name was not cached.")? - ) - } - Type::AssetPtr(inner) => format!( - "crate::engine::TAssetPtr<{}>", - self.get_type_path(inner) - .context("type name was not cached.")? - ), - Type::Array(inner) => { - format!("crate::engine::TArray<{}>", self.type_name(&inner)?) - } - Type::Primitive(prim) => { - format!("{prim}") - } - Type::RawArray { ty, len } => { - format!("[{}; {}]", self.type_name(&ty)?, len) - } - Type::Name => "crate::engine::FName".to_string(), - Type::String => "crate::engine::FString".to_string(), - Type::Text => "crate::engine::FText".to_string(), - Type::Enum { enum_type, .. } => self - .get_type_path(enum_type) - .context("type name was not cached.")?, - Type::Class(class) => { - format!( - "::core::option::Option<{}>", - self.get_type_path(class) - .context("type name was not cached.")? - ) - } - Type::Struct(class) => self - .get_type_path(class) - .context("type name was not cached.")? - .clone(), - }; - - Ok(type_name) - } - fn generate_enum(&self, enum0: &Enum) -> anyhow::Result { let name = self .get_type_ident(&enum0.obj_ref) @@ -1006,7 +933,7 @@ pub mod rust { .map(|ty| { ( self.get_type_package_path(&ty.obj_ref()).unwrap(), - self.get_type_name(&ty.obj_ref()).unwrap(), + self.get_type_ident(&ty.obj_ref()).unwrap(), ) }) .map(|(super_path, super_name)| {