From 20ddfffb6a17963a9b1b06dbf6c1407ae7d58723 Mon Sep 17 00:00:00 2001
From: Jordan Rose <jrose@signal.org>
Date: Mon, 4 Apr 2022 11:48:56 -0700
Subject: [PATCH] Fix regression in CamelCase rename rule (should be
 lowerCamelCase)

---
 src/bindgen/rename.rs                   |  2 +-
 tests/expectations/rename_case.c        | 14 ++++++++++++++
 tests/expectations/rename_case.compat.c | 22 ++++++++++++++++++++++
 tests/expectations/rename_case.cpp      | 19 +++++++++++++++++++
 tests/expectations/rename_case.pyx      | 17 +++++++++++++++++
 tests/rust/rename_case.rs               | 19 +++++++++++++++++++
 6 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 tests/expectations/rename_case.c
 create mode 100644 tests/expectations/rename_case.compat.c
 create mode 100644 tests/expectations/rename_case.cpp
 create mode 100644 tests/expectations/rename_case.pyx
 create mode 100644 tests/rust/rename_case.rs

diff --git a/src/bindgen/rename.rs b/src/bindgen/rename.rs
index f559289dd..e58b7a5ae 100644
--- a/src/bindgen/rename.rs
+++ b/src/bindgen/rename.rs
@@ -73,7 +73,7 @@ impl RenameRule {
             RenameRule::LowerCase => text.to_lowercase(),
             RenameRule::UpperCase => text.to_uppercase(),
             RenameRule::PascalCase => text.to_pascal_case(),
-            RenameRule::CamelCase => text.to_upper_camel_case(),
+            RenameRule::CamelCase => text.to_lower_camel_case(),
             RenameRule::SnakeCase => text.to_snake_case(),
             RenameRule::ScreamingSnakeCase => text.to_shouty_snake_case(),
             RenameRule::QualifiedScreamingSnakeCase => {
diff --git a/tests/expectations/rename_case.c b/tests/expectations/rename_case.c
new file mode 100644
index 000000000..c57482319
--- /dev/null
+++ b/tests/expectations/rename_case.c
@@ -0,0 +1,14 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+void test_camel_case(int32_t fooBar);
+
+void test_pascal_case(int32_t FooBar);
+
+void test_snake_case(int32_t foo_bar);
+
+void test_screaming_snake_case(int32_t FOO_BAR);
+
+void test_gecko_case(int32_t aFooBar);
diff --git a/tests/expectations/rename_case.compat.c b/tests/expectations/rename_case.compat.c
new file mode 100644
index 000000000..61e3310e8
--- /dev/null
+++ b/tests/expectations/rename_case.compat.c
@@ -0,0 +1,22 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void test_camel_case(int32_t fooBar);
+
+void test_pascal_case(int32_t FooBar);
+
+void test_snake_case(int32_t foo_bar);
+
+void test_screaming_snake_case(int32_t FOO_BAR);
+
+void test_gecko_case(int32_t aFooBar);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff --git a/tests/expectations/rename_case.cpp b/tests/expectations/rename_case.cpp
new file mode 100644
index 000000000..794fa0cfd
--- /dev/null
+++ b/tests/expectations/rename_case.cpp
@@ -0,0 +1,19 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+extern "C" {
+
+void test_camel_case(int32_t fooBar);
+
+void test_pascal_case(int32_t FooBar);
+
+void test_snake_case(int32_t foo_bar);
+
+void test_screaming_snake_case(int32_t FOO_BAR);
+
+void test_gecko_case(int32_t aFooBar);
+
+} // extern "C"
diff --git a/tests/expectations/rename_case.pyx b/tests/expectations/rename_case.pyx
new file mode 100644
index 000000000..5fd35fc4c
--- /dev/null
+++ b/tests/expectations/rename_case.pyx
@@ -0,0 +1,17 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  void test_camel_case(int32_t fooBar);
+
+  void test_pascal_case(int32_t FooBar);
+
+  void test_snake_case(int32_t foo_bar);
+
+  void test_screaming_snake_case(int32_t FOO_BAR);
+
+  void test_gecko_case(int32_t aFooBar);
diff --git a/tests/rust/rename_case.rs b/tests/rust/rename_case.rs
new file mode 100644
index 000000000..e83227d02
--- /dev/null
+++ b/tests/rust/rename_case.rs
@@ -0,0 +1,19 @@
+/// cbindgen:rename-all=CamelCase
+#[no_mangle]
+pub extern "C" fn test_camel_case(foo_bar: i32) {}
+
+/// cbindgen:rename-all=PascalCase
+#[no_mangle]
+pub extern "C" fn test_pascal_case(foo_bar: i32) {}
+
+/// cbindgen:rename-all=SnakeCase
+#[no_mangle]
+pub extern "C" fn test_snake_case(foo_bar: i32) {}
+
+/// cbindgen:rename-all=ScreamingSnakeCase
+#[no_mangle]
+pub extern "C" fn test_screaming_snake_case(foo_bar: i32) {}
+
+/// cbindgen:rename-all=GeckoCase
+#[no_mangle]
+pub extern "C" fn test_gecko_case(foo_bar: i32) {}