Merge branch 'eqrion:master' into zig-bindgen

.github/workflows/cbindgen.yml

@@ -41,11 +41,11 @@ jobs:
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.40.0
+        toolchain: 1.54.0
 
     - name: Build with minimum supported Rust version
       run: |
-        cargo +1.40.0 test nonexistent-test --verbose
+        cargo +1.54.0 test nonexistent-test --verbose
 
   build:
 

CHANGES

@@ -1,3 +1,14 @@
+## 0.21.0
+
+      * Update MSRV to 1.54.0
+      * Update clap to 3.1.
+      * Update heck to 0.4.0
+      * unraw identifiers
+      * Honor documentation_length in Cython.
+      * Add documentation_style to with short and full options
+      * Map RawFd to Int
+      * Respect remove_underscores config when prefixing name to enum
+
 ## 0.20.0
 
      * Add Builder::with_using_namespaces. (#688)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cbindgen"
-version = "0.20.0"
+version = "0.21.0"
 authors = [
   "Emilio Cobos Álvarez <[email protected]>",
   "Jeff Muizelaar <[email protected]>",
@@ -21,7 +21,7 @@ exclude = [
 travis-ci = { repository = "eqrion/cbindgen" }
 
 [dependencies]
-clap = { version = "2", optional = true }
+clap = { version = "3.1", optional = true }
 indexmap = "1"
 log = "0.4"
 serde = { version = "1.0.103", default-features = false, features = ["derive"]}
@@ -30,7 +30,7 @@ tempfile = "3.0"
 toml = "0.5"
 proc-macro2 = "1"
 quote = "1"
-heck = "0.3"
+heck = "0.4"
 
 [dependencies.syn]
 version = "1.0.3"

README.md

@@ -79,7 +79,6 @@ in production:
 * [milksnake](https://github.com/getsentry/milksnake)
 * [webrender](https://searchfox.org/mozilla-central/source/gfx/webrender_bindings) ([generated header](https://searchfox.org/mozilla-central/source/__GENERATED__/gfx/webrender_bindings/webrender_ffi_generated.h))
 * [stylo](https://searchfox.org/mozilla-central/source/layout/style) ([generated header](https://searchfox.org/mozilla-central/source/__GENERATED__/layout/style/ServoStyleConsts.h))
-* [etesync-rs](https://github.com/etesync/etesync-rs)
 
 If you're using `cbindgen` and would like to be added to this list, please open
 a pull request!

src/bindgen/rename.rs

@@ -69,11 +69,11 @@ impl RenameRule {
 
         Cow::Owned(match self {
             RenameRule::None => return Cow::Borrowed(text),
-            RenameRule::GeckoCase => context.to_str().to_owned() + &text.to_camel_case(),
+            RenameRule::GeckoCase => context.to_str().to_owned() + &text.to_upper_camel_case(),
             RenameRule::LowerCase => text.to_lowercase(),
             RenameRule::UpperCase => text.to_uppercase(),
-            RenameRule::PascalCase => text.to_camel_case(),
-            RenameRule::CamelCase => text.to_mixed_case(),
+            RenameRule::PascalCase => text.to_pascal_case(),
+            RenameRule::CamelCase => text.to_upper_camel_case(),
             RenameRule::SnakeCase => text.to_snake_case(),
             RenameRule::ScreamingSnakeCase => text.to_shouty_snake_case(),
             RenameRule::QualifiedScreamingSnakeCase => {