Merge pull request #22 from josephlr/edition

Cleanup, fix warnings, move to 2018 edition

Author: mathstuf

Cargo.toml

@@ -3,22 +3,21 @@ name = "keyutils"
 version = "0.4.0"
 authors = ["Ben Boeckel <mathstuf@gmail.com>"]
 license = "BSD-3-Clause"
-description = """
-Rust interface to the Linux keyring.
-"""
+description = "Rust interface to the Linux keyring."
 repository = "https://github.com/mathstuf/rust-keyutils.git"
-homepage = "https://github.com/mathstuf/rust-keyutils.git"
-documentation = "https://docs.rs/keyutils/~0.4"
+homepage = "https://github.com/mathstuf/rust-keyutils"
+documentation = "https://docs.rs/keyutils"
 readme = "README.md"
+edition = "2018"
 
 [workspace]
 members = ["libkeyutils-sys"]
 
 [dependencies]
-bitflags = "^1.0"
-errno = "~0.2"
-itertools = "~0.8"
-libkeyutils-sys = { path = "libkeyutils-sys", version = "~0.3.1" }
-log = "~0.4"
+bitflags = "1.0"
+errno = "0.2"
+itertools = "0.8"
+libkeyutils-sys = { path = "libkeyutils-sys" }
+log = "0.4"
 
-libc = "~0.2"
+libc = "0.2"

libkeyutils-sys/Cargo.toml

@@ -3,14 +3,12 @@ name = "libkeyutils-sys"
 version = "0.3.1"
 authors = ["Ben Boeckel <mathstuf@gmail.com>"]
 license = "BSD-3-Clause"
-description = """
-FFI bindings to libkeyutils.
-"""
+description = "FFI bindings to libkeyutils."
 repository = "https://github.com/mathstuf/rust-keyutils.git"
-homepage = "https://github.com/mathstuf/rust-keyutils.git"
-documentation = "https://docs.rs/libkeyutils-sys/~0.3"
+homepage = "https://github.com/mathstuf/rust-keyutils"
 keywords = ["keyutils"]
 links = "keyutils"
+edition = "2018"
 
 [dependencies]
-libc = "~0.2"
+libc = "0.2"

libkeyutils-sys/src/constants.rs

@@ -27,7 +27,7 @@
 // Ignore rustfmt changes in here. The horizontal alignment is too useful to give up.
 #![cfg_attr(rustfmt, rustfmt_skip)]
 
-use types::{key_perm_t, key_serial_t};
+use crate::types::{key_perm_t, key_serial_t};
 
 pub const KEY_TYPE_USER:                    &str = "user";
 pub const KEY_TYPE_LOGON:                   &str = "logon";

libkeyutils-sys/src/functions.rs

@@ -24,9 +24,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-use crates::libc;
-
-use types::{key_perm_t, key_serial_t};
+use crate::types::{key_perm_t, key_serial_t};
 
 #[rustfmt::skip]
 extern "C" {

libkeyutils-sys/src/lib.rs

@@ -37,10 +37,6 @@
 //!   - `keyctl(3)`
 //!   - `keyctl(7)`
 
-mod crates {
-    pub extern crate libc;
-}
-
 mod constants;
 mod functions;
 mod types;

libkeyutils-sys/src/types.rs

@@ -26,7 +26,5 @@
 
 #![allow(non_camel_case_types)]
 
-use crates::libc;
-
-pub type key_serial_t = libc::int32_t;
-pub type key_perm_t = libc::uint32_t;
+pub type key_serial_t = i32;
+pub type key_perm_t = u32;

src/api.rs

@@ -32,13 +32,12 @@ use std::result;
 use std::str;
 use std::time::Duration;
 
-use crates::errno;
-use crates::libc;
-use crates::libkeyutils_sys::*;
+use libkeyutils_sys::*;
+use log::error;
 
-use constants::{DefaultKeyring, KeyPermissions, KeyringSerial, Permission, SpecialKeyring};
-use keytype::*;
-use keytypes;
+use crate::constants::{DefaultKeyring, KeyPermissions, KeyringSerial, Permission, SpecialKeyring};
+use crate::keytype::*;
+use crate::keytypes;
 
 /// Reexport of `Errno` as `Error`.
 pub type Error = errno::Errno;
@@ -806,14 +805,8 @@ impl KeyManager {
 #[cfg(test)]
 mod tests {
     use std::thread;
-    use std::time::Duration;
 
-    use crates::libc;
-
-    use api::Keyring;
-    use constants::{Permission, SpecialKeyring};
-    use keytype::KeyType;
-    use keytypes;
+    use super::*;
 
     #[test]
     fn test_add_key() {

src/constants.rs

@@ -24,7 +24,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-use crates::libkeyutils_sys::*;
+use bitflags::bitflags;
+use libkeyutils_sys::*;
 
 /// Special keyrings predefined for a process.
 pub enum SpecialKeyring {

src/keytypes/asymmetric.rs

@@ -26,7 +26,7 @@
 
 //! Asymmetric keys
 
-use keytype::*;
+use crate::keytype::*;
 
 /// Asymmetric keys support encrypting, decrypting, signing, and verifying data.
 ///

src/keytypes/big_key.rs

@@ -26,7 +26,7 @@
 
 //! Big keys
 
-use keytype::*;
+use crate::keytype::*;
 
 /// Big keys.
 ///