Fix name of static

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -2994,9 +2994,7 @@ std::string Converter::ConvertDeclRefExpr(clang::DeclRefExpr *expr) {
   if (auto *function = decl->getAsFunction()) {
     if (auto method = clang::dyn_cast<clang::CXXMethodDecl>(function)) {
       if (IsStaticMethod(method)) {
-        //return GetFunctionRefName(method);
-        return std::format("{}::{}", GetRecordName(method->getParent()),
-                           GetNamedDeclAsString(method));
+        return GetFunctionRefName(method);
       }
     }
     return GetNamedDeclAsString(function->getCanonicalDecl());

cpp2rust/converter/converter_lib.cpp

@@ -427,8 +427,7 @@ bool IsPassThroughConstructor(const clang::CXXConstructorDecl *ctor) {
 bool IsConvertibleCXXRecordDecl(const clang::CXXRecordDecl *decl) {
   if (decl->isLambda()) {
     // The call operator of a generic lambda is a template pattern
-    return decl->isGenericLambda() ||
-           decl->getLambdaCallOperator()->hasBody();
+    return decl->isGenericLambda() || decl->getLambdaCallOperator()->hasBody();
   }
   return decl->isThisDeclarationADefinition() && !decl->isDependentContext();
 }
@@ -1105,10 +1104,9 @@ bool LambdaCallOperatorIsDeducible(const clang::CXXMethodDecl *op) {
   if (tmpl == nullptr) {
     return true;
   }
-  return llvm::any_of(tmpl->getTemplatedDecl()->parameters(),
-                      [](const auto *param) {
-                        return param->getType()->isDependentType();
-                      });
+  return llvm::any_of(
+      tmpl->getTemplatedDecl()->parameters(),
+      [](const auto *param) { return param->getType()->isDependentType(); });
 }
 
 std::vector<clang::CXXMethodDecl *>

tests/unit/lambda_generic_explicit_args.cpp

@@ -8,7 +8,9 @@ static int sum(Val a, Val b) { return a.x + b.x; }
 
 int main() {
   int total = 0;
-  auto tally = [&total]<typename T, typename U> { total += sizeof(T) + sizeof(U); };
+  auto tally = [&total]<typename T, typename U> {
+    total += sizeof(T) + sizeof(U);
+  };
   tally.operator()<char, char>();
   tally.operator()<int, char>();
   assert(total == 7);

tests/unit/out/refcount/fn_ptr_struct.rs

@@ -81,7 +81,7 @@ fn main_0() -> i32 {
         Rc::new(RefCell::new(FnPtr::<fn(i32) -> i32>::new(S::solo)));
     assert!((({ (*p1.borrow()).call(5,) }) == 6));
     assert!((({ (*p2.borrow()).call(5,) }) == 8));
-    assert!((({ S::pick(5_i64,) }) == 7));
+    assert!((({ S::pick_i64(5_i64,) }) == 7));
     let h3: Value<Handler> = Rc::new(RefCell::new(Handler {
         tag: Rc::new(RefCell::new(3)),
         cb: Rc::new(RefCell::new((FnPtr::<fn(i32) -> i32>::new(S::pick_i32)))),

tests/unit/out/unsafe/fn_ptr_struct.rs

@@ -51,7 +51,7 @@ unsafe fn main_0() -> i32 {
     let mut p2: Option<unsafe fn(i32) -> i32> = Some(S::solo);
     assert!(((unsafe { (p1).unwrap()(5,) }) == (6)));
     assert!(((unsafe { (p2).unwrap()(5,) }) == (8)));
-    assert!(((unsafe { S::pick(5_i64,) }) == (7)));
+    assert!(((unsafe { S::pick_i64(5_i64,) }) == (7)));
     let mut h3: Handler = Handler {
         tag: 3,
         cb: (Some(S::pick_i32)),