Merge branch 'master' of https://github.com/rust-lang/rust-bindgen into merge-upstream

Author: adetaylor

.github/workflows/bindgen.yml

@@ -9,7 +9,7 @@ on:
       - master
 
 jobs:
-  rustfmt:
+  rustfmt-clippy:
     runs-on: ubuntu-latest
 
     steps:
@@ -46,13 +46,13 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          # MSRV below is documented in README.md, please update that if you
+          # MSRV below is documented in Cargo.toml and README.md, please update those if you
           # change this.
-          toolchain: 1.54.0
+          toolchain: 1.57.0
           override: true
 
       - name: Build with msrv
-        run: rm Cargo.lock && cargo +1.54.0 build --lib
+        run: rm Cargo.lock && cargo +1.57.0 build --lib
 
   quickchecking:
     runs-on: ubuntu-latest
@@ -68,7 +68,7 @@ jobs:
 
       # TODO: Actually run quickchecks once `bindgen` is reliable enough.
       - name: Build quickcheck tests
-        run: cd tests/quickchecking && cargo test
+        run: cd bindgen-tests/tests/quickchecking && cargo test
 
   test-expectations:
     runs-on: ${{matrix.os}}
@@ -88,7 +88,7 @@ jobs:
           override: true
 
       - name: Test expectations
-        run: cd tests/expectations && cargo test
+        run: cd bindgen-tests/tests/expectations && cargo test
 
   test:
     runs-on: ${{matrix.os}}

.gitignore

@@ -2,7 +2,8 @@
 target/
 *~
 bindgen-integration/Cargo.lock
-tests/expectations/Cargo.lock
+bindgen-tests/tests/expectations/Cargo.lock
+bindgen-tests/tests/quickchecking/Cargo.lock
 #*#
 
 # Test script output

CHANGELOG.md

@@ -7,133 +7,139 @@
   - [Removed](#removed)
   - [Fixed](#fixed)
   - [Security](#security)
-- [0.60.0](#0600)
+- [0.61.0](#0610)
   - [Added](#added-1)
-  - [Fixed](#fixed-1)
   - [Changed](#changed-1)
-  - [Removed](#removed-1)
-- [0.59.2](#0592)
-- [0.59.1](#0591)
+  - [Fixed](#fixed-1)
+- [0.60.1](#0601)
   - [Fixed](#fixed-2)
-- [0.59.0](#0590)
+- [0.60.0](#0600)
   - [Added](#added-2)
   - [Fixed](#fixed-3)
   - [Changed](#changed-2)
-- [0.58.1](#0581)
-  - [Added](#added-3)
-- [0.58.0](#0580)
-  - [Added](#added-4)
+  - [Removed](#removed-1)
+- [0.59.2](#0592)
+- [0.59.1](#0591)
   - [Fixed](#fixed-4)
+- [0.59.0](#0590)
+  - [Added](#added-3)
+  - [Fixed](#fixed-5)
   - [Changed](#changed-3)
+- [0.58.1](#0581)
+  - [Added](#added-4)
+- [0.58.0](#0580)
+  - [Added](#added-5)
+  - [Fixed](#fixed-6)
+  - [Changed](#changed-4)
   - [Deprecated](#deprecated)
   - [Removed](#removed-2)
-  - [Fixed](#fixed-5)
+  - [Fixed](#fixed-7)
   - [Security](#security-1)
 - [0.57.0](#0570)
-  - [Added](#added-5)
-  - [Fixed](#fixed-6)
-- [0.56.0](#0560)
   - [Added](#added-6)
-  - [Changed](#changed-4)
-  - [Fixed](#fixed-7)
-- [0.55.1](#0551)
   - [Fixed](#fixed-8)
-- [0.55.0](#0550)
-  - [Removed](#removed-3)
+- [0.56.0](#0560)
   - [Added](#added-7)
   - [Changed](#changed-5)
   - [Fixed](#fixed-9)
-- [0.54.1](#0541)
+- [0.55.1](#0551)
+  - [Fixed](#fixed-10)
+- [0.55.0](#0550)
+  - [Removed](#removed-3)
   - [Added](#added-8)
   - [Changed](#changed-6)
-  - [Fixed](#fixed-10)
-- [0.54.0](#0540)
+  - [Fixed](#fixed-11)
+- [0.54.1](#0541)
   - [Added](#added-9)
   - [Changed](#changed-7)
-  - [Fixed](#fixed-11)
-- [0.53.3](#0533)
-  - [Added](#added-10)
   - [Fixed](#fixed-12)
-- [0.53.2](#0532)
+- [0.54.0](#0540)
+  - [Added](#added-10)
   - [Changed](#changed-8)
-- [0.53.1](#0531)
+  - [Fixed](#fixed-13)
+- [0.53.3](#0533)
   - [Added](#added-11)
-- [0.53.0](#0530)
-  - [Added](#added-12)
+  - [Fixed](#fixed-14)
+- [0.53.2](#0532)
   - [Changed](#changed-9)
-  - [Fixed](#fixed-13)
-- [0.52.0](#0520)
+- [0.53.1](#0531)
+  - [Added](#added-12)
+- [0.53.0](#0530)
   - [Added](#added-13)
   - [Changed](#changed-10)
-  - [Fixed](#fixed-14)
-- [0.51.1](#0511)
   - [Fixed](#fixed-15)
+- [0.52.0](#0520)
+  - [Added](#added-14)
   - [Changed](#changed-11)
-- [0.51.0](#0510)
   - [Fixed](#fixed-16)
+- [0.51.1](#0511)
+  - [Fixed](#fixed-17)
   - [Changed](#changed-12)
-  - [Added](#added-14)
-- [0.50.0](#0500)
+- [0.51.0](#0510)
+  - [Fixed](#fixed-18)
+  - [Changed](#changed-13)
   - [Added](#added-15)
-- [0.49.3](#0493)
+- [0.50.0](#0500)
   - [Added](#added-16)
+- [0.49.3](#0493)
+  - [Added](#added-17)
 - [0.49.2](#0492)
-  - [Changed](#changed-13)
-- [0.49.1](#0491)
-  - [Fixed](#fixed-17)
   - [Changed](#changed-14)
-- [0.49.0](#0490)
-  - [Added](#added-17)
-  - [Fixed](#fixed-18)
+- [0.49.1](#0491)
+  - [Fixed](#fixed-19)
   - [Changed](#changed-15)
+- [0.49.0](#0490)
+  - [Added](#added-18)
+  - [Fixed](#fixed-20)
+  - [Changed](#changed-16)
 - [0.48.1](#0481)
-  - [Fixed](#fixed-19)
+  - [Fixed](#fixed-21)
 - [0.48.0](#0480)
-  - [Changed](#changed-16)
-  - [Fixed](#fixed-20)
+  - [Changed](#changed-17)
+  - [Fixed](#fixed-22)
 - [0.47.4](#0474)
-  - [Added](#added-18)
+  - [Added](#added-19)
 - [0.47.3](#0473)
-  - [Changed](#changed-17)
+  - [Changed](#changed-18)
 - [0.47.2](#0472)
-  - [Fixed](#fixed-21)
+  - [Fixed](#fixed-23)
 - [0.47.1](#0471)
-  - [Changed](#changed-18)
-  - [Fixed](#fixed-22)
-- [0.47.0](#0470)
   - [Changed](#changed-19)
-  - [Fixed](#fixed-23)
+  - [Fixed](#fixed-24)
+- [0.47.0](#0470)
+  - [Changed](#changed-20)
+  - [Fixed](#fixed-25)
 - [0.33.1 .. 0.46.0](#0331--0460)
-  - [Added](#added-19)
+  - [Added](#added-20)
   - [Removed](#removed-4)
-  - [Changed](#changed-20)
-  - [Fixed](#fixed-24)
+  - [Changed](#changed-21)
+  - [Fixed](#fixed-26)
 - [0.33.1](#0331)
-  - [Fixed](#fixed-25)
+  - [Fixed](#fixed-27)
 - [0.33.0](#0330)
 - [0.32.2](#0322)
-  - [Fixed](#fixed-26)
+  - [Fixed](#fixed-28)
 - [0.32.1](#0321)
-  - [Fixed](#fixed-27)
+  - [Fixed](#fixed-29)
 - [0.32.0](#0320)
-  - [Added](#added-20)
-  - [Changed](#changed-21)
-  - [Fixed](#fixed-28)
-- [0.31.0](#0310)
   - [Added](#added-21)
   - [Changed](#changed-22)
+  - [Fixed](#fixed-30)
+- [0.31.0](#0310)
+  - [Added](#added-22)
+  - [Changed](#changed-23)
   - [Deprecated](#deprecated-1)
   - [Removed](#removed-5)
-  - [Fixed](#fixed-29)
+  - [Fixed](#fixed-31)
 - [0.30.0](#0300)
-  - [Added](#added-22)
-  - [Changed](#changed-23)
-  - [Deprecated](#deprecated-2)
-  - [Fixed](#fixed-30)
-- [0.29.0](#0290)
   - [Added](#added-23)
   - [Changed](#changed-24)
-  - [Fixed](#fixed-31)
+  - [Deprecated](#deprecated-2)
+  - [Fixed](#fixed-32)
+- [0.29.0](#0290)
+  - [Added](#added-24)
+  - [Changed](#changed-25)
+  - [Fixed](#fixed-33)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -142,15 +148,70 @@
 # Unreleased
 
 ## Added
+ * new feature: `--override-abi` flag to override the ABI used by functions
+   matching a regular expression.
 
 ## Changed
 
+ * Regex inputs are sanitized so alternation (`a|b`) is handled correctly but
+   wildcard patterns (`*`) are now considered invalid.
+ * the `ParseCallbacks`trait does not require to implement `UnwindSafe`.
+ * the `Builder::parse_callbacks` method no longer overwrites previously added
+   callbacks and composes them in a last-to-first manner.
+
 ## Removed
 
 ## Fixed
 
 ## Security
 
+# 0.61.0
+
+Released 2022/10/16
+
+## Added
+
+ * new feature: `--sort-semantically` flag to sort the output in a predefined
+   manner [(#1743)].
+ * new feature: `Bindgen::emit_warnings` method to emit warnings to stderr in
+   build scripts.
+ * new feature: `--newtype-global-enum` flag to generate enum variants as
+   global constants.
+ * new feature: `--default-non-copy-union-style` flag to set the default style
+   of code used to generate unions with non-`Copy` members.
+ * new feature: `--bindgen-wrapper-union` flag to mark any union that matches a
+   regex and has a non-Copy member to use a bindgen-generated wrapper for its
+   fields.
+ * new feature: `--manually-drop-union` flag to mark any union that matches a
+   regex and has a non-`Copy` member to use `ManuallyDrop`.
+ * new feature: `--merge-extern-blocks` flag to merge several `extern` blocks
+   that have the same ABI.
+ * new feature: `--no-size_t-is-usize` flag to not bind `size_t` as `usize`.
+ * new feature: `Builder` implements `Clone`.
+
+## Changed
+
+ * clap and regex have been updated, new msrv is 1.57.
+ * The `--enable-function-attribute-detection` flag is also used to detect
+   diverging functions so the generated bindings use `!` as the return type.
+ * The `--size_t-is-usize` flag is enabled by default.
+ * Unused type aliases for `<stdint.h>` types are no longer emitted.
+ * The `blocklist` options now can be used to block objective-C methods.
+ * The `core::ffi` module is used the sized raw integer types
+   instead of `std::os::raw` if the Rust target version is `1.64` or higher and
+   the `--use-core` flag is enabled.
+ * The `bindgen` CLI utility must be installed using `cargo install
+   bindgen-cli` now.
+ * Using `bindgen` as a library no longer pulls clap and any other CLI
+   related dependencies.
+
+## Fixed
+
+ * Const correctness of incomplete arrays has been fixed. (#2301)
+ * C++ inline namespaces don't panic. (#2294)
+
+[(#1743)]: https://github.com/rust-lang/rust-bindgen/issues/1743
+
 # 0.60.1
 
 Released 2022/06/06

CONTRIBUTING.md

@@ -152,6 +152,9 @@ $ cargo test
 
 ### Testing a Single Header's Bindings Generation and Compiling its Bindings
 
+Note: You will to need to install [Graphviz](https://graphviz.org/) since that
+is a dependency for running `test-one.sh`.
+
 Sometimes its useful to work with one test header from start (generating
 bindings for it) to finish (compiling the bindings and running their layout
 tests). This can be done with the `tests/test-one.sh` script. It supports fuzzy
@@ -315,7 +318,19 @@ parameters a given type uses. The analyses are defined in
 
 The final phase is generating Rust source text from the analyzed IR, and it is
 defined in `src/codegen/*`. We use the `quote` crate, which provides the `quote!
-{ ... }` macro for quasi-quoting Rust forms.
+{ ... }` macro for quasi-quoting Rust forms. Some options that affect the
+generated Rust code are implemented using the [`syn`](https://docs.rs/syn) crate.
+
+### Implementing new options using `syn`
+
+If a new option can be implemented using the `syn` crate it should be added to
+the `codegen::postprocessing` module by following these steps:
+
+- Introduce a new field to `BindgenOptions` for the option.
+- Write a free function inside `codegen::postprocessing` implementing the
+  option. This function with the same name of the `BindgenOptions` field.
+- Add a new value to the `codegen::postprocessing::PASSES` for the option using
+  the `pass!` macro.
 
 ## Pull Requests and Code Reviews
 
@@ -404,7 +419,7 @@ $ brew install creduce
 $ # Etc...
 ```
 
-[Otherwise, follow these instructions for building and/or installing `creduce`.](https://github.com/csmith-project/creduce/blob/master/INSTALL)
+Otherwise, follow [these instructions](https://github.com/csmith-project/creduce/blob/master/INSTALL.md) for building and/or installing `creduce`.
 
 Running `creduce` requires two things: