FIx default for std::array

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -739,12 +739,6 @@ bool Converter::TypeDerivesDefault(clang::QualType qual_type) {
     return false;
   }
 
-  // Types that need a custom array initializer (e.g., std::array, which is
-  // translated to Vec)
-  if (!GetArrayDefaultAsString(qual_type).empty()) {
-    return false;
-  }
-
   // libc types do not implement Default
   if (auto record = qual_type->getAsRecordDecl()) {
     if (ctx_.getSourceManager().isInSystemHeader(record->getLocation()) &&
@@ -3637,7 +3631,7 @@ bool Converter::VisitInitListExpr(clang::InitListExpr *expr) {
         StrCat("vec!");
         VisitInitListExpr(init);
       } else {
-        StrCat(GetArrayDefaultAsString(qual_type));
+        StrCat(GetDefaultAsString(qual_type));
       }
       SetFreshType(qual_type);
       return false;

cpp2rust/converter/models/converter_refcount.cpp

@@ -1888,7 +1888,7 @@ bool ConverterRefCount::VisitInitListExpr(clang::InitListExpr *expr) {
         PushConversionKind push(*this, ConversionKind::Unboxed);
         ConverterRefCount::VisitInitListExpr(init);
       } else {
-        StrCat(GetArrayDefaultAsString(qual_type));
+        StrCat(GetDefaultAsString(qual_type));
       }
       computed_expr_type_ = ComputedExprType::FreshValue;
       return false;

tests/unit/out/refcount/empty_array_init.rs

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

tests/unit/out/unsafe/empty_array_init.rs

@@ -13,7 +13,7 @@ pub fn main() {
     }
 }
 unsafe fn main_0() -> i32 {
-    let mut vec_: Vec<i32> = std::array::from_fn::<_, 3, _>(|_| Default::default()).to_vec();
+    let mut vec_: Vec<i32> = std::array::from_fn::<_, 3_u64, _>(|_| <i32>::default()).to_vec();
     return 0;
 }
 pub unsafe fn __cpp2rust_init_globals() {}