Skip to content

Commit

Permalink
Merge #437 #459
Browse files Browse the repository at this point in the history
437: Update arrow2 requirement from 0.17 to 0.18 r=lnicola a=dependabot[bot]

Updates the requirements on [arrow2](https://github.com/jorgecarleitao/arrow2) to permit the latest version.
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a href="https://github.com/jorgecarleitao/arrow2/commits">compare view</a></li>
</ul>
</details>
<br />


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` show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency
- ``@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>

459: Update bindgen requirement from 0.68 to 0.69 r=lnicola a=dependabot[bot]

Updates the requirements on [bindgen](https://github.com/rust-lang/rust-bindgen) to permit the latest version.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/rust-lang/rust-bindgen/releases">bindgen's releases</a>.</em></p>
<blockquote>
<h2>v0.69.0</h2>
<h2>Install bindgen-cli 0.69.0</h2>
<h3>Install prebuilt binaries via shell script</h3>
<pre lang="sh"><code>curl --proto '=https' --tlsv1.2 -LsSf https://github.com/rust-lang/rust-bindgen/releases/download/v0.69.0/bindgen-cli-installer.sh | sh
</code></pre>
<h2>Download bindgen-cli 0.69.0</h2>
<table>
<thead>
<tr>
<th>File</th>
<th>Platform</th>
<th>Checksum</th>
</tr>
</thead>
<tbody>
<tr>
<td><a href="https://github.com/rust-lang/rust-bindgen/releases/download/v0.69.0/bindgen-cli-aarch64-apple-darwin.tar.xz">bindgen-cli-aarch64-apple-darwin.tar.xz</a></td>
<td>macOS Apple Silicon</td>
<td><a href="https://github.com/rust-lang/rust-bindgen/releases/download/v0.69.0/bindgen-cli-aarch64-apple-darwin.tar.xz.sha256">checksum</a></td>
</tr>
<tr>
<td><a href="https://github.com/rust-lang/rust-bindgen/releases/download/v0.69.0/bindgen-cli-x86_64-apple-darwin.tar.xz">bindgen-cli-x86_64-apple-darwin.tar.xz</a></td>
<td>macOS Intel</td>
<td><a href="https://github.com/rust-lang/rust-bindgen/releases/download/v0.69.0/bindgen-cli-x86_64-apple-darwin.tar.xz.sha256">checksum</a></td>
</tr>
<tr>
<td><a href="https://github.com/rust-lang/rust-bindgen/releases/download/v0.69.0/bindgen-cli-x86_64-unknown-linux-gnu.tar.xz">bindgen-cli-x86_64-unknown-linux-gnu.tar.xz</a></td>
<td>Linux x64</td>
<td><a href="https://github.com/rust-lang/rust-bindgen/releases/download/v0.69.0/bindgen-cli-x86_64-unknown-linux-gnu.tar.xz.sha256">checksum</a></td>
</tr>
</tbody>
</table>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/rust-lang/rust-bindgen/blob/main/CHANGELOG.md">bindgen's changelog</a>.</em></p>
<blockquote>
<h1>0.69.0 (2023-11-01)</h1>
<h2>Added</h2>
<ul>
<li>Added the <code>ParseCallbacks::header_file</code> callback which runs on every filename passed to <code>Builder::header</code>.</li>
<li>Added the <code>CargoCallbacks::new</code> constructor which emits a cargo-rerun line
for every input header file by default.</li>
<li>Added the <code>CargoCallbacks::rerun_on_header_files</code> method to configure whether
a cargo-rerun line should be emitted for every input header file.</li>
</ul>
<h2>Changed</h2>
<ul>
<li>The <code>--wrap-static-fns</code> feature was updated so function types that has no
argument use <code>void</code> as its sole argument.</li>
<li><code>CargoCallbacks</code> is no longer a <a href="https://doc.rust-lang.org/reference/items/structs.html">unit-like
struct</a> and the
<code>CargoCallbacks</code> constant was added to mitigate the breaking nature of this
change. This constant has been marked as deprecated and users will have to
use the new <code>CargoCallbacks::new</code> method in the future.</li>
</ul>
<h2>Removed</h2>
<h2>Fixed</h2>
<ul>
<li>Allow compiling <code>bindgen-cli</code> with a static libclang.</li>
<li>Emit an opaque integer type for pointer types that don't have the same size
as the target's pointer size.</li>
<li>Avoid escaping Objective-C method names unless they are <code>Self</code>, <code>self</code>,
<code>crate</code> or <code>super</code>.</li>
</ul>
<h2>Security</h2>
<h1>0.68.1</h1>
<h2>Fixed</h2>
<ul>
<li>Fixed errors on the windows artifact build process.</li>
</ul>
<h1>0.68.0</h1>
<h2>Added</h2>
<ul>
<li>The <code>system</code> ABI is now supported as an option for the <code>--override-abi</code> flag.</li>
<li>The <code>allowlist_item</code> method and the <code>--allowlist-item</code> flag have been
included to filter items regardless or their kind.</li>
<li>Include installers as release artifacts on Github.</li>
</ul>
<h2>Changed</h2>
<ul>
<li>The <code>Clone</code> implementation for <code>_BindgenUnionField</code> has been changed to pass
the <code>incorrect_clone_impl_on_copy_type</code> Clippy lint.</li>
<li>The <code>c_unwind</code> ABI can be used without a feature gate for any Rust target version
equal to or greater than 1.71.
This comes as a result of the ABI being stabilised (in Rust 1.71).</li>
<li>Formatting changes when using prettyplease as a formatter due to a new
prettyplease version.</li>
<li>Avoid generating invalid <code>CStr</code> constants when using the <code>--generate-cstr</code>
option.</li>
</ul>
<h2>Removed</h2>
<ul>
<li>The <code>extra_assert</code> and <code>extra_assert_eq</code> macros are no longer exported.</li>
</ul>
<h2>Fixed</h2>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/rust-lang/rust-bindgen/commit/c73990cc0f714ce79e444039f09eaf1f769d7e6a"><code>c73990c</code></a> Rename secret for crates.io token</li>
<li><a href="https://github.com/rust-lang/rust-bindgen/commit/1279a11dfb9560554fbfaecc427d3fc8753942dd"><code>1279a11</code></a> chore: Release</li>
<li><a href="https://github.com/rust-lang/rust-bindgen/commit/d1cc3c2432ce4e7e8bf7b0462e54d61731f72118"><code>d1cc3c2</code></a> Update release instructions</li>
<li><a href="https://github.com/rust-lang/rust-bindgen/commit/7ed33dde6311f425cfef06c8b48a025f9c0064e7"><code>7ed33dd</code></a> Update the changelog using cargo release</li>
<li><a href="https://github.com/rust-lang/rust-bindgen/commit/04fa3930f45bbff050f97e6d45e0ddcbb98bde85"><code>04fa393</code></a> publish from GitHub release page (<a href="https://github.com/rust-lang/rust-bindgen/issues/2645">#2645</a>)</li>
<li><a href="https://github.com/rust-lang/rust-bindgen/commit/5d1a25447fd5d8f7f0a0b18487721099e71064f7"><code>5d1a254</code></a> Fix the <code>check-cfg</code> workflow (<a href="https://github.com/rust-lang/rust-bindgen/issues/2676">#2676</a>)</li>
<li><a href="https://github.com/rust-lang/rust-bindgen/commit/89a84f6c251c3894397d04f75d2bf2219e806c3c"><code>89a84f6</code></a> Bump rustix from 0.36.7 to 0.36.16 (<a href="https://github.com/rust-lang/rust-bindgen/issues/2666">#2666</a>)</li>
<li><a href="https://github.com/rust-lang/rust-bindgen/commit/e41f9dcd31cc3ac6bf79ccfe477055b19c190e47"><code>e41f9dc</code></a> bump cargo dist, and disable trying to create windows releases (<a href="https://github.com/rust-lang/rust-bindgen/issues/2660">#2660</a>)</li>
<li><a href="https://github.com/rust-lang/rust-bindgen/commit/100ab4c6c86a0dfa2a3d075457c5b50e5feb80e7"><code>100ab4c</code></a> [Doc] Add missing entry for allowlist-item. (<a href="https://github.com/rust-lang/rust-bindgen/issues/2659">#2659</a>)</li>
<li><a href="https://github.com/rust-lang/rust-bindgen/commit/7b9567394e2ba7d76341746db36133da31e3b682"><code>7b95673</code></a> Let clap handle all CLI parsing errors (<a href="https://github.com/rust-lang/rust-bindgen/issues/2656">#2656</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/rust-lang/rust-bindgen/compare/v0.68.0...v0.69.0">compare view</a></li>
</ul>
</details>
<br />


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` show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency
- ``@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>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
bors[bot] and dependabot[bot] authored Nov 2, 2023
3 parents 2c1b33b + 6676117 + 690693a commit 552f9dd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ semver = "1.0"
[dev-dependencies]
tempfile = "3.8"
# Only used in the example
arrow2 = "0.17"
arrow2 = "0.18"

[workspace]
members = ["gdal-sys"]
Expand Down
2 changes: 1 addition & 1 deletion gdal-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ links="gdal"
libc = "0.2"

[build-dependencies]
bindgen = { version = "0.68", optional = true }
bindgen = { version = "0.69", optional = true }
pkg-config = "0.3"
semver = "1.0"

0 comments on commit 552f9dd

Please sign in to comment.