Move std::array default in rules

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -4302,33 +4302,6 @@ std::string Converter::GetArrayDefaultAsString(clang::QualType qual_type) {
   if (clang::isa<clang::IncompleteArrayType>(qual_type)) {
     return "[]";
   }
-  if (IsStdDecl(qual_type->getAsCXXRecordDecl(), "array")) {
-    assert(GetTemplateArgs(qual_type).has_value());
-    auto template_args = *GetTemplateArgs(qual_type);
-    assert(template_args.size() == 2);
-    auto array_size = template_args[1];
-    unsigned size = 0;
-    switch (array_size.getKind()) {
-    case clang::TemplateArgument::Expression: {
-      auto array_size_expr = array_size.getAsExpr();
-      assert(array_size_expr && !array_size_expr->isValueDependent());
-      clang::Expr::EvalResult result;
-      ENSURE(array_size_expr->EvaluateAsInt(result, ctx_));
-      size = result.Val.getInt().getZExtValue();
-      break;
-    }
-    case clang::TemplateArgument::Integral: {
-      size = array_size.getAsIntegral().getZExtValue();
-      break;
-    }
-    default:
-      assert(0 && "Unsupported array size kind");
-      break;
-    }
-    return std::format(
-        "std::array::from_fn::<_, {}, _>(|_| Default::default()).to_vec()",
-        size);
-  }
   return {};
 }
 

rules/array/tgt_unsafe.rs

@@ -3,8 +3,8 @@
 
 use libcc2rs::*;
 
-fn t1<T1>() -> Vec<T1> {
-    Default::default()
+fn t1<T1: Default + Clone, const T2: usize>() -> Vec<T1> {
+    std::array::from_fn::<_, T2, _>(|_| <T1>::default()).to_vec()
 }
 
 fn t2() -> usize {

tests/unit/out/refcount/empty_array_init.rs

@@ -11,9 +11,7 @@ pub fn main() {
     std::process::exit(main_0());
 }
 fn main_0() -> i32 {
-    let vec_: Value<Vec<i32>> = Rc::new(RefCell::new(
-        std::array::from_fn::<_, 3, _>(|_| Default::default()).to_vec(),
-    ));
+    let vec_: Value<Vec<i32>> = Rc::new(RefCell::new());
     return 0;
 }
 pub fn __cpp2rust_init_globals() {}

tests/unit/out/refcount/inline_container_fields.rs

@@ -55,7 +55,7 @@ impl Default for State {
                 grid: (0..2)
                     .map(|_| (0..3).map(|_| 0_i32).collect::<Box<[i32]>>())
                     .collect::<Box<[Box<[i32]>]>>(),
-                arr: std::array::from_fn::<_, 3, _>(|_| Default::default()).to_vec(),
+                arr: std::array::from_fn::<_, 3_u64, _>(|_| <i32>::default()).to_vec(),
                 elems: Default::default(),
                 rows: Default::default(),
             }

tests/unit/out/refcount/libc_struct_without_default.rs

@@ -20,7 +20,7 @@ impl Default for UserDefined {
     fn default() -> Self {
         {
             UserDefined {
-                a: std::array::from_fn::<_, 1, _>(|_| Default::default()).to_vec(),
+                a: std::array::from_fn::<_, 1_u64, _>(|_| <i32>::default()).to_vec(),
                 v: Default::default(),
             }
         }

tests/unit/out/unsafe/inline_container_fields.rs

@@ -28,7 +28,7 @@ impl Default for State {
             State {
                 count: 0_i32,
                 grid: [[0_i32; 3]; 2],
-                arr: std::array::from_fn::<_, 3, _>(|_| Default::default()).to_vec(),
+                arr: std::array::from_fn::<_, 3_u64, _>(|_| <i32>::default()).to_vec(),
                 elems: Default::default(),
                 rows: Default::default(),
             }

tests/unit/out/unsafe/libc_struct_without_default.rs

@@ -16,7 +16,7 @@ impl Default for UserDefined {
     fn default() -> Self {
         unsafe {
             UserDefined {
-                a: std::array::from_fn::<_, 1, _>(|_| Default::default()).to_vec(),
+                a: std::array::from_fn::<_, 1_u64, _>(|_| <i32>::default()).to_vec(),
                 v: Default::default(),
             }
         }