diff options
author | Robin Krahl <robin.krahl@ireas.org> | 2019-01-23 02:44:20 +0000 |
---|---|---|
committer | Robin Krahl <robin.krahl@ireas.org> | 2019-01-23 03:51:37 +0100 |
commit | 601bc22ae18838ff56b64c15b365bcf7f93006be (patch) | |
tree | 3a20a71c90746c4db9c0d96820870bd72e60b9dc | |
parent | 57e3c6bf010d51842cbc86a9801fd9baee1b22eb (diff) | |
download | nitrokey-rs-601bc22ae18838ff56b64c15b365bcf7f93006be.tar.gz nitrokey-rs-601bc22ae18838ff56b64c15b365bcf7f93006be.tar.bz2 |
Prefer into() over numeric casting
Numeric casting might truncate an integer, while into() is only
implemented for numeric types if the cast is possible without
truncation.
-rw-r--r-- | CHANGELOG.md | 1 | ||||
-rw-r--r-- | TODO.md | 1 | ||||
-rw-r--r-- | src/util.rs | 3 |
3 files changed, 2 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e962e0..5466620 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Remove the `CommandError::Undefined` variant. - Add a private `PhantomData` field to `Pro` and `Storage` to make direct instantiation impossible. +- Prefer using the `Into` trait over numeric casting. # v0.3.4 (2019-01-20) - Fix authentication methods that assumed that `char` is signed. @@ -8,7 +8,6 @@ - Fix timing issues with the `totp_no_pin` and `totp_pin` test cases. - Clear passwords from memory. - Find a nicer syntax for the `write_config` test. -- Check integer conversions. - Consider implementing `Into<CommandError>` for `(Device, CommandError)` - Lock password safe in `PasswordSafe::drop()` (see [nitrokey-storage-firmware issue 65][]). diff --git a/src/util.rs b/src/util.rs index 79b8c34..2542a7b 100644 --- a/src/util.rs +++ b/src/util.rs @@ -59,8 +59,7 @@ pub fn get_command_result(value: c_int) -> Result<(), Error> { } pub fn get_last_result() -> Result<(), Error> { - let value = unsafe { nitrokey_sys::NK_get_last_command_status() } as c_int; - get_command_result(value) + get_command_result(unsafe { nitrokey_sys::NK_get_last_command_status() }.into()) } pub fn get_last_error() -> Error { |