diff options
| author | Robin Krahl <me@robin-krahl.de> | 2020-09-20 04:46:26 +0200 |
|---|---|---|
| committer | Robin Krahl <robin.krahl@ireas.org> | 2020-09-20 11:46:45 +0200 |
| commit | 483ec7256d6c4d01ba6c41513fdf8bbd7df6b4b3 (patch) | |
| tree | 1731929765dc470e66ab714bc6ad79e2cd2521eb /patches | |
| parent | 90bcfc8cc905b09d99064fc17a745c8ae2288c62 (diff) | |
| download | nitrokey-sys-rs-483ec7256d6c4d01ba6c41513fdf8bbd7df6b4b3.tar.gz nitrokey-sys-rs-483ec7256d6c4d01ba6c41513fdf8bbd7df6b4b3.tar.bz2 | |
Re-generate bindings in src/ffi.rs
Older versions of bindgen rendered C++ doc comments as Rust doc comments
using the /// syntax. Newer versions use the doc attribute instead.
This patch re-generates the src/ffi.rs file with bindgen 0.55.1 so that
it uses the new format. This makes it easier to perform changes in the
future.
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/deprecated.diff | 8 | ||||
| -rw-r--r-- | patches/remove-uint.diff | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/patches/deprecated.diff b/patches/deprecated.diff index dff4b55..a7d2359 100644 --- a/patches/deprecated.diff +++ b/patches/deprecated.diff @@ -6,10 +6,10 @@ Index: nitrokey-sys-rs/src/ffi.rs =================================================================== --- nitrokey-sys-rs.orig/src/ffi.rs +++ nitrokey-sys-rs/src/ffi.rs -@@ -763,6 +763,7 @@ extern "C" { - /// deprecated in favor of NK_get_status_as_string. - /// @return string representation of the status or an empty string - /// if the command failed +@@ -762,6 +762,7 @@ extern "C" { + #[doc = " deprecated in favor of NK_get_status_as_string."] + #[doc = " @return string representation of the status or an empty string"] + #[doc = " if the command failed"] + #[deprecated(since = "3.5.0", note="use `NK_get_status_as_string` instead")] pub fn NK_status() -> *mut ::std::os::raw::c_char; } diff --git a/patches/remove-uint.diff b/patches/remove-uint.diff index 2db1d95..e4c24ba 100644 --- a/patches/remove-uint.diff +++ b/patches/remove-uint.diff @@ -10,12 +10,12 @@ Index: nitrokey-sys-rs/src/ffi.rs --- nitrokey-sys-rs.orig/src/ffi.rs +++ nitrokey-sys-rs/src/ffi.rs @@ -1,9 +1,5 @@ - /* automatically generated by rust-bindgen */ + /* automatically generated by rust-bindgen 0.55.1 */ -pub type __uint8_t = ::std::os::raw::c_uchar; -pub type __uint16_t = ::std::os::raw::c_ushort; -pub type __uint32_t = ::std::os::raw::c_uint; -pub type __uint64_t = ::std::os::raw::c_ulong; extern "C" { - #[link_name = "\u{1}NK_PWS_SLOT_COUNT"] - pub static mut NK_PWS_SLOT_COUNT: u8; + pub static NK_PWS_SLOT_COUNT: u8; + } |