wip

kurtbuilds · Sep 15, 2024 · 20d180b · 20d180b
1 parent 752d418
commit 20d180b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/libninja/src/rust/codegen/ty.rs b/libninja/src/rust/codegen/ty.rs
@@ -1,8 +1,7 @@
-use proc_macro2::TokenStream;
-use quote::quote;
-
 use hir::HirSpec;
 use mir::Ty;
+use proc_macro2::TokenStream;
+use quote::quote;
 
 use crate::rust::codegen::ToRustIdent;
 use crate::rust::lower_hir::HirFieldExt;
@@ -85,7 +84,7 @@ impl ToRustType for Ty {
             Ty::Array(_) => true,
             Ty::Model(name) => {
                 let model = spec.get_record(name.as_str()).expect("Model not found");
-                model.fields().all(|f| f.implements_default(spec))
+                model.fields().count() > 0 && model.fields().all(|f| f.implements_default(spec))
             }
             Ty::Unit => true,
             Ty::Any(_) => true,

diff --git a/mir_rust/src/enum.rs b/mir_rust/src/enum.rs
@@ -29,7 +29,7 @@ pub fn lower_enum(e: &hir::Enum, derives: &[String]) -> Enum<TokenStream, RustEx
         })
         .collect();
     let derives = derives_to_tokens(derives);
-    let derives = quote! { #[derive(Debug, Serialize, Deserialize #derives)] };
+    let derives = quote! { #[derive(Debug, Serialize, Deserialize, Clone #derives)] };
     Enum {
         name: e.name.to_rust_struct(),
         doc: e.doc.clone(),