Move std::initializer_list in rules

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -4273,11 +4273,11 @@ bool Converter::VisitClassTemplateDecl(clang::ClassTemplateDecl *decl) {
 
 bool Converter::VisitCXXStdInitializerListExpr(
     clang::CXXStdInitializerListExpr *expr) {
-  if (expr->getSubExpr()->getType()->isArrayType()) {
-    // Arrays become Vec's
-    StrCat("vec!");
-  }
-  Convert(expr->getSubExpr());
+  auto *backing = expr->getSubExpr();
+  auto str = GetMappedAsString(expr, &backing, 1);
+  ENSURE(!str.empty());
+  StrCat(str);
+  SetFreshType(expr->getType());
   return false;
 }
 

cpp2rust/converter/rules/expr_matcher.cpp

@@ -97,6 +97,9 @@ ResolvedDecl getResolvedDecl(clang::ASTContext &ctx, const clang::Expr *expr,
       list && list->getType()->isRecordType()) {
     return AggregateUsage{*RuleKeys::GetTypeKey(list->getType())};
   }
+  if (llvm::isa<clang::CXXStdInitializerListExpr>(expr)) {
+    return AggregateUsage{*RuleKeys::GetTypeKey(expr->getType())};
+  }
   if (auto construct = llvm::dyn_cast<clang::CXXUnresolvedConstructExpr>(expr);
       construct && construct->isListInitialization()) {
     return AggregateUsage{*RuleKeys::GetTypeKey(construct->getTypeAsWritten())};
@@ -167,6 +170,8 @@ std::vector<clang::Expr *> getOperands(clang::ASTContext &ctx,
     operands.assign(construct->arg_begin(), construct->arg_end());
   } else if (auto list = llvm::dyn_cast<clang::InitListExpr>(expr)) {
     operands.assign(list->inits().begin(), list->inits().end());
+  } else if (auto list = llvm::dyn_cast<clang::CXXStdInitializerListExpr>(expr)) {
+    operands.push_back(list->getSubExpr()->IgnoreImplicit());
   } else if (auto member = llvm::dyn_cast<clang::MemberExpr>(expr)) {
     auto macro_base =
         RuleDecls::GetMacroMemberBase(ctx.getSourceManager(), member);

cpp2rust/converter/rules/rule_keys.cpp

@@ -187,6 +187,9 @@ std::optional<ExprKey> getExprKey(clang::ASTContext &ctx,
       list && list->getType()->isRecordType()) {
     return getConstructorKey(getParent(list->getType()));
   }
+  if (llvm::isa<clang::CXXStdInitializerListExpr>(expr)) {
+    return getConstructorKey(getParent(expr->getType()));
+  }
   return std::nullopt;
 }
 

cpp2rust/converter/rules/rules_loader.cpp

@@ -489,8 +489,8 @@ std::string ExprKey(clang::ASTContext &ctx, const clang::Expr *expr) {
   if (auto construct = llvm::dyn_cast<clang::CXXConstructExpr>(expr)) {
     return FunctionKey(construct->getConstructor());
   }
-  if (auto list = llvm::dyn_cast<clang::InitListExpr>(expr)) {
-    if (auto record = list->getType()->getAsRecordDecl();
+  if (llvm::isa<clang::InitListExpr, clang::CXXStdInitializerListExpr>(expr)) {
+    if (auto record = expr->getType()->getAsRecordDecl();
         record && !IsUserDefinedDecl(record)) {
       return ConstructorKey(ClassKey(record));
     }

rules/initializer_list/src.cpp

@@ -1,6 +1,7 @@
 // Copyright (c) 2022-present INESC-ID.
 // Distributed under the MIT license that can be found in the LICENSE file.
 
+#include <cstddef>
 #include <initializer_list>
 
 template <typename T1> using t1 = std::initializer_list<T1>;
@@ -12,3 +13,8 @@ typename std::initializer_list<T1>::size_type
 f1(const std::initializer_list<T1> &o) {
   return o.size();
 }
+
+template <typename T1, std::size_t T2>
+std::initializer_list<T1> f2(const T1 (&a0)[T2]) {
+  return std::initializer_list<T1>{a0};
+}

rules/initializer_list/tgt_unsafe.rs

@@ -14,3 +14,7 @@ fn t2() -> usize {
 unsafe fn f1<T1>(a0: Vec<T1>) -> usize {
     a0.len()
 }
+
+unsafe fn f2<T1, const T2: usize>(a0: [T1; T2]) -> Vec<T1> {
+    Vec::from(a0)
+}