ir: Deal with name conflicts correctly in declaration type resolution. #651
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
So, basically, make opaque items last, and make previous names override them. Fixes #649
emilio
force-pushed
the
conflict-opaque
branch
from
5c9a5cb
to
a099a1d
Compare
emilio
added a commit
that referenced
this pull request
Feb 1, 2021
bors bot
added a commit
to crypto-com/thaler
that referenced
this pull request
Feb 2, 2021
2484: Bump cbindgen from 0.16.0 to 0.17.0 r=tomtau a=dependabot-preview[bot] Bumps [cbindgen](https://github.com/eqrion/cbindgen) from 0.16.0 to 0.17.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/eqrion/cbindgen/releases">cbindgen's releases</a>.</em></p> <blockquote> <h2>v0.17.0</h2> <ul> <li>Add with_parse_extra_bindings to builder. (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/645">#645</a>)</li> <li>Support NonZero and fix incorrect simplification of Option<!-- raw HTML omitted --> into ptr. (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/647">#647</a>)</li> <li>Deal with name conflicts correctly in declaration type resolution. (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/651">#651</a>)</li> <li>Support pointers to ZSTs. (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/656">#656</a>)</li> </ul> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/eqrion/cbindgen/blob/master/CHANGES">cbindgen's changelog</a>.</em></p> <blockquote> <h2>0.17.0</h2> <pre><code> * Add with_parse_extra_bindings to builder. ([#645](mozilla/cbindgen#645)) * Support NonZero and fix incorrect simplification of Option<ptr> into ptr. ([#647](mozilla/cbindgen#647)) * Deal with name conflicts correctly in declaration type resolution. ([#651](mozilla/cbindgen#651)) * Support pointers to ZSTs. ([#656](mozilla/cbindgen#656)) </code></pre> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/eqrion/cbindgen/commit/8236c8267936ae66785cd236c9c119c2f5b95b57"><code>8236c82</code></a> v0.17.0</li> <li><a href="https://github.com/eqrion/cbindgen/commit/3d41d33ffe1b1f811a5e3e3a8a077b8ec7464150"><code>3d41d33</code></a> config: Deal with clippy lints -.-.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/c5c301b08a6a604d15e4ac6f18cb4ad5a916b4f1"><code>c5c301b</code></a> ir: Support pointers to zsts.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/d3cd22bc6f07ccb595b8b82c8765f9023f2ffcc1"><code>d3cd22b</code></a> doc: Document the <code>documentation</code> config entry.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/d0d287f9f32f4b64017250c0054e2637befa1075"><code>d0d287f</code></a> parser: Deal with a new clippy warning.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/750745831af8755790a42f199b7733b37a3d9e0d"><code>7507458</code></a> ir: Deal with name conflicts correctly in declaration type resolution.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/c47ee1516be72f4278b2c5e6b64a1e1edad13faf"><code>c47ee15</code></a> ir: Handle NonZero and simplify Option<NonZero> like we simplify Option<NonNu...</li> <li><a href="https://github.com/eqrion/cbindgen/commit/f922f68531fa44708af7779ffbb4b118d6e189ae"><code>f922f68</code></a> ir: Avoid generating bogus pointer arguments.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/4ba7d1f0833b2c09b1c77a3012460c937b414f52"><code>4ba7d1f</code></a> ir: Make simplify_standard_types less clone-happy.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/2e1be241671a356516cf8c910ba40c014c7b3144"><code>2e1be24</code></a> ir: Give integers a more structured representation.</li> <li>Additional commits viewable in <a href="https://github.com/eqrion/cbindgen/compare/v0.16.0...v0.17.0">compare view</a></li> </ul> </details> <br /> [](https://dependabot.com/compatibility-score/?dependency-name=cbindgen&package-manager=cargo&previous-version=0.16.0&new-version=0.17.0) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language - `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com): - Update frequency (including time of day and day of week) - Pull request limits (per update run and/or open at any time) - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired) </details> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
bors bot
added a commit
to crypto-com/thaler
that referenced
this pull request
Feb 2, 2021
2484: Bump cbindgen from 0.16.0 to 0.17.0 r=tomtau a=dependabot-preview[bot] Bumps [cbindgen](https://github.com/eqrion/cbindgen) from 0.16.0 to 0.17.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/eqrion/cbindgen/releases">cbindgen's releases</a>.</em></p> <blockquote> <h2>v0.17.0</h2> <ul> <li>Add with_parse_extra_bindings to builder. (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/645">#645</a>)</li> <li>Support NonZero and fix incorrect simplification of Option<!-- raw HTML omitted --> into ptr. (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/647">#647</a>)</li> <li>Deal with name conflicts correctly in declaration type resolution. (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/651">#651</a>)</li> <li>Support pointers to ZSTs. (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/656">#656</a>)</li> </ul> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/eqrion/cbindgen/blob/master/CHANGES">cbindgen's changelog</a>.</em></p> <blockquote> <h2>0.17.0</h2> <pre><code> * Add with_parse_extra_bindings to builder. ([#645](mozilla/cbindgen#645)) * Support NonZero and fix incorrect simplification of Option<ptr> into ptr. ([#647](mozilla/cbindgen#647)) * Deal with name conflicts correctly in declaration type resolution. ([#651](mozilla/cbindgen#651)) * Support pointers to ZSTs. ([#656](mozilla/cbindgen#656)) </code></pre> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/eqrion/cbindgen/commit/8236c8267936ae66785cd236c9c119c2f5b95b57"><code>8236c82</code></a> v0.17.0</li> <li><a href="https://github.com/eqrion/cbindgen/commit/3d41d33ffe1b1f811a5e3e3a8a077b8ec7464150"><code>3d41d33</code></a> config: Deal with clippy lints -.-.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/c5c301b08a6a604d15e4ac6f18cb4ad5a916b4f1"><code>c5c301b</code></a> ir: Support pointers to zsts.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/d3cd22bc6f07ccb595b8b82c8765f9023f2ffcc1"><code>d3cd22b</code></a> doc: Document the <code>documentation</code> config entry.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/d0d287f9f32f4b64017250c0054e2637befa1075"><code>d0d287f</code></a> parser: Deal with a new clippy warning.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/750745831af8755790a42f199b7733b37a3d9e0d"><code>7507458</code></a> ir: Deal with name conflicts correctly in declaration type resolution.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/c47ee1516be72f4278b2c5e6b64a1e1edad13faf"><code>c47ee15</code></a> ir: Handle NonZero and simplify Option<NonZero> like we simplify Option<NonNu...</li> <li><a href="https://github.com/eqrion/cbindgen/commit/f922f68531fa44708af7779ffbb4b118d6e189ae"><code>f922f68</code></a> ir: Avoid generating bogus pointer arguments.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/4ba7d1f0833b2c09b1c77a3012460c937b414f52"><code>4ba7d1f</code></a> ir: Make simplify_standard_types less clone-happy.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/2e1be241671a356516cf8c910ba40c014c7b3144"><code>2e1be24</code></a> ir: Give integers a more structured representation.</li> <li>Additional commits viewable in <a href="https://github.com/eqrion/cbindgen/compare/v0.16.0...v0.17.0">compare view</a></li> </ul> </details> <br /> [](https://dependabot.com/compatibility-score/?dependency-name=cbindgen&package-manager=cargo&previous-version=0.16.0&new-version=0.17.0) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language - `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com): - Update frequency (including time of day and day of week) - Pull request limits (per update run and/or open at any time) - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired) </details> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
bors-servo
added a commit
to servo/servo
that referenced
this pull request
Apr 6, 2022
Bump cbindgen from 0.14.6 to 0.20.0 Bumps [cbindgen](https://github.com/eqrion/cbindgen) from 0.14.6 to 0.20.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/eqrion/cbindgen/releases">cbindgen's releases</a>.</em></p> <blockquote> <h2>v0.20.0</h2> <ul> <li>Add Builder::with_using_namespaces. (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/688">#688</a>)</li> <li>Ignore PhantomPinned. (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/695">#695</a>)</li> <li>Simplify Pin<!-- raw HTML omitted --> to T. (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/697">#697</a>)</li> <li>Update --pretty=expanded to -Zunpretty=expanded. (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/706">#706</a>)</li> </ul> <h2>v0.19.0</h2> <ul> <li>Simplify types in generics (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/663">#663</a>)</li> <li>Use --profile=check for macro expansion (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/671">#671</a>)</li> <li>Use exported name to prefix enum variants (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/672">#672</a>)</li> <li>Fix path attribute handling in inline submodules (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/679">#679</a>)</li> <li>Fix a stack overflow with some recursive typedefs (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/680">#680</a>)</li> </ul> <h2>v0.18.0</h2> <ul> <li>Simplify types in nested types such as pointed-to types and function signatures (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/661">#661</a>)</li> </ul> <h2>v0.17.0</h2> <ul> <li>Add with_parse_extra_bindings to builder. (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/645">#645</a>)</li> <li>Support NonZero and fix incorrect simplification of Option<!-- raw HTML omitted --> into ptr. (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/647">#647</a>)</li> <li>Deal with name conflicts correctly in declaration type resolution. (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/651">#651</a>)</li> <li>Support pointers to ZSTs. (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/656">#656</a>)</li> </ul> <h2>v0.16.0</h2> <p>No release notes provided.</p> <h2>v0.15.0</h2> <p>No release notes provided.</p> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/eqrion/cbindgen/blob/master/CHANGES">cbindgen's changelog</a>.</em></p> <blockquote> <h2>0.20.0</h2> <pre><code> * Add Builder::with_using_namespaces. ([#688](mozilla/cbindgen#688)) * Ignore PhantomPinned. ([#695](mozilla/cbindgen#695)) * Simplify Pin<T> to T. ([#697](mozilla/cbindgen#697)) * Update --pretty=expanded to -Zunpretty=expanded. ([#706](mozilla/cbindgen#706)) </code></pre> <h2>0.19.0</h2> <pre><code> * Simplify types in generics ([#663](mozilla/cbindgen#663)) * Use --profile=check for macro expansion ([#671](mozilla/cbindgen#671)) * Use exported name to prefix enum variants ([#672](mozilla/cbindgen#672)) * Fix path attribute handling in inline submodules ([#679](mozilla/cbindgen#679)) * Fix a stack overflow with some recursive typedefs ([#680](mozilla/cbindgen#680)) </code></pre> <h2>0.18.0</h2> <pre><code> * Simplify types in nested types such as pointed-to types and function signatures ([#661](mozilla/cbindgen#661)) </code></pre> <h2>0.17.0</h2> <pre><code> * Add with_parse_extra_bindings to builder. ([#645](mozilla/cbindgen#645)) * Support NonZero and fix incorrect simplification of Option<ptr> into ptr. ([#647](mozilla/cbindgen#647)) * Deal with name conflicts correctly in declaration type resolution. ([#651](mozilla/cbindgen#651)) * Support pointers to ZSTs. ([#656](mozilla/cbindgen#656)) </code></pre> <h2>0.16.0</h2> <pre><code> * Remove artificial restriction on lifetime parameters on enums ([#604](mozilla/cbindgen#604)) * Add an option for converting usize/isize into size_t/ptrdiff_t. ([#606](mozilla/cbindgen#606)) * Allow controlling the cargo profile used for expansion. ([#607](mozilla/cbindgen#607)) * Support wider range of expressions in enum discriminants ([#614](mozilla/cbindgen#614)) * Support generation of Cython bindings ([#590](mozilla/cbindgen#590)) * Fixed some issues with style=tag and recursive structs ([#615](mozilla/cbindgen#615)) * Default C style to Both (as specified in docs) ([#615](mozilla/cbindgen#615)) * Fix resolution of path dependencies from certain modules. ([#629](mozilla/cbindgen#629)) * Support inlined definitions for tuple variants with a single field in C ([#631](mozilla/cbindgen#631)) </code></pre> <p>Thanks to all the awesome contributors that contributed to this release.</p> <h2>0.15.0</h2> <pre><code> * Allow customizing mangling of generic parameters in C ([#575](mozilla/cbindgen#575)) * Box<T> simplifies to T* in C (4ce324c) * ManuallyDrop<T> and MaybeUninit<T> simplify to T in C, and are opaque in C++ (0076a17) * C++ supports a derive-ostream annotation to derive serialization of structs, unions and enums ([#582](mozilla/cbindgen#582)) * Large character constants have been fixed on Windows ([#586](mozilla/cbindgen#586)) * Constants are now generated for typedefs, etc ([#589](mozilla/cbindgen#589)) * The `sort_by` configuration option has been made to work for constants ([#587](mozilla/cbindgen#587)) * Default sort order is source order now (sort_by = "None"), and can be changed by the above option ([#587](mozilla/cbindgen#587)) </code></pre> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/eqrion/cbindgen/commit/41506d5aeb2be8d200f52d08afb0c243414eb00d"><code>41506d5</code></a> v0.20.0</li> <li><a href="https://github.com/eqrion/cbindgen/commit/34299aef5610fa82a058374bdfce8d782e0abe29"><code>34299ae</code></a> Don't use <code>check</code> profile when expanding code on a release build</li> <li><a href="https://github.com/eqrion/cbindgen/commit/6c96c8ab957542eb0bebe576fee3fb1241db0114"><code>6c96c8a</code></a> Update --pretty=expanded to -Zunpretty=expanded</li> <li><a href="https://github.com/eqrion/cbindgen/commit/57add9c86083b492266c8511fba30fb7c37cce25"><code>57add9c</code></a> Fix some clippy lints.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/63c1043dfb92fcac0bf3073c2d71e9e4ac69c943"><code>63c1043</code></a> Simplify Pin<T> to T</li> <li><a href="https://github.com/eqrion/cbindgen/commit/ccd1f0e9ec2369735b9481c85057b9c65b6b0908"><code>ccd1f0e</code></a> add <code>Builder::with_using_namespaces</code></li> <li><a href="https://github.com/eqrion/cbindgen/commit/4e394493d63c2348a08d486562dc2082cbdfe306"><code>4e39449</code></a> Ignore PhantomPinned</li> <li><a href="https://github.com/eqrion/cbindgen/commit/2d20c4b15179523b10605bdd95006882dd1c8e4e"><code>2d20c4b</code></a> Move the target-guessing code from <a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/676">#676</a> to its own function.</li> <li><a href="https://github.com/eqrion/cbindgen/commit/93c06c5c9d319f481788c9670700097b4e46d270"><code>93c06c5</code></a> Only fetch dependencies for current platform by default (<a href="https://github-redirect.dependabot.com/eqrion/cbindgen/issues/676">#676</a>)</li> <li><a href="https://github.com/eqrion/cbindgen/commit/d9e490ce8b836194595bd30611253a7028059da2"><code>d9e490c</code></a> v0.19.0</li> <li>Additional commits viewable in <a href="https://github.com/eqrion/cbindgen/compare/v0.14.6...v0.20.0">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
So, basically, make opaque items last, and make previous names override
them.
Fixes #649