cargo: update bitflags to 1.0

Author: mathstuf

Cargo.toml

@@ -15,7 +15,7 @@ readme = "README.md"
 members = ["libkeyutils-sys"]
 
 [dependencies]
-bitflags = "~0.9"
+bitflags = "^1.0"
 errno = "~0.2"
 libkeyutils-sys = { path = "libkeyutils-sys", version = "~0.3.1" }
 log = "~0.4"

src/api.rs

@@ -28,7 +28,7 @@ use crates::errno;
 use crates::libc;
 use crates::libkeyutils_sys::*;
 
-use constants::*;
+use constants::{DefaultKeyring, KeyringSerial, KeyPermissions, Permission, SpecialKeyring};
 use keytype::*;
 use keytypes;
 
@@ -811,7 +811,7 @@ mod tests {
     use std::time::Duration;
 
     use api::Keyring;
-    use constants::{self, SpecialKeyring};
+    use constants::{Permission, SpecialKeyring};
     use keytype::KeyType;
     use keytypes;
 
@@ -1019,10 +1019,10 @@ mod tests {
         let perms = description.perms;
         let new_perms = {
             let mut tmp_perms = perms.clone();
-            let write_bits = constants::POSSESSOR_WRITE
-                | constants::USER_WRITE
-                | constants::GROUP_WRITE
-                | constants::OTHER_WRITE;
+            let write_bits = Permission::POSSESSOR_WRITE
+                | Permission::USER_WRITE
+                | Permission::GROUP_WRITE
+                | Permission::OTHER_WRITE;
             tmp_perms.remove(write_bits);
             tmp_perms
         };

src/constants.rs

@@ -266,35 +266,35 @@ fn test_default_keyring_ids() {
 
 #[test]
 fn test_permission_bits() {
-    assert_eq!(POSSESSOR_VIEW.bits, KEY_POS_VIEW);
-    assert_eq!(POSSESSOR_READ.bits, KEY_POS_READ);
-    assert_eq!(POSSESSOR_WRITE.bits, KEY_POS_WRITE);
-    assert_eq!(POSSESSOR_SEARCH.bits, KEY_POS_SEARCH);
-    assert_eq!(POSSESSOR_LINK.bits, KEY_POS_LINK);
-    assert_eq!(POSSESSOR_SET_ATTRIBUTE.bits, KEY_POS_SETATTR);
-    assert_eq!(POSSESSOR_ALL.bits, KEY_POS_ALL);
+    assert_eq!(Permission::POSSESSOR_VIEW.bits, KEY_POS_VIEW);
+    assert_eq!(Permission::POSSESSOR_READ.bits, KEY_POS_READ);
+    assert_eq!(Permission::POSSESSOR_WRITE.bits, KEY_POS_WRITE);
+    assert_eq!(Permission::POSSESSOR_SEARCH.bits, KEY_POS_SEARCH);
+    assert_eq!(Permission::POSSESSOR_LINK.bits, KEY_POS_LINK);
+    assert_eq!(Permission::POSSESSOR_SET_ATTRIBUTE.bits, KEY_POS_SETATTR);
+    assert_eq!(Permission::POSSESSOR_ALL.bits, KEY_POS_ALL);
 
-    assert_eq!(USER_VIEW.bits, KEY_USR_VIEW);
-    assert_eq!(USER_READ.bits, KEY_USR_READ);
-    assert_eq!(USER_WRITE.bits, KEY_USR_WRITE);
-    assert_eq!(USER_SEARCH.bits, KEY_USR_SEARCH);
-    assert_eq!(USER_LINK.bits, KEY_USR_LINK);
-    assert_eq!(USER_SET_ATTRIBUTE.bits, KEY_USR_SETATTR);
-    assert_eq!(USER_ALL.bits, KEY_USR_ALL);
+    assert_eq!(Permission::USER_VIEW.bits, KEY_USR_VIEW);
+    assert_eq!(Permission::USER_READ.bits, KEY_USR_READ);
+    assert_eq!(Permission::USER_WRITE.bits, KEY_USR_WRITE);
+    assert_eq!(Permission::USER_SEARCH.bits, KEY_USR_SEARCH);
+    assert_eq!(Permission::USER_LINK.bits, KEY_USR_LINK);
+    assert_eq!(Permission::USER_SET_ATTRIBUTE.bits, KEY_USR_SETATTR);
+    assert_eq!(Permission::USER_ALL.bits, KEY_USR_ALL);
 
-    assert_eq!(GROUP_VIEW.bits, KEY_GRP_VIEW);
-    assert_eq!(GROUP_READ.bits, KEY_GRP_READ);
-    assert_eq!(GROUP_WRITE.bits, KEY_GRP_WRITE);
-    assert_eq!(GROUP_SEARCH.bits, KEY_GRP_SEARCH);
-    assert_eq!(GROUP_LINK.bits, KEY_GRP_LINK);
-    assert_eq!(GROUP_SET_ATTRIBUTE.bits, KEY_GRP_SETATTR);
-    assert_eq!(GROUP_ALL.bits, KEY_GRP_ALL);
+    assert_eq!(Permission::GROUP_VIEW.bits, KEY_GRP_VIEW);
+    assert_eq!(Permission::GROUP_READ.bits, KEY_GRP_READ);
+    assert_eq!(Permission::GROUP_WRITE.bits, KEY_GRP_WRITE);
+    assert_eq!(Permission::GROUP_SEARCH.bits, KEY_GRP_SEARCH);
+    assert_eq!(Permission::GROUP_LINK.bits, KEY_GRP_LINK);
+    assert_eq!(Permission::GROUP_SET_ATTRIBUTE.bits, KEY_GRP_SETATTR);
+    assert_eq!(Permission::GROUP_ALL.bits, KEY_GRP_ALL);
 
-    assert_eq!(OTHER_VIEW.bits, KEY_OTH_VIEW);
-    assert_eq!(OTHER_READ.bits, KEY_OTH_READ);
-    assert_eq!(OTHER_WRITE.bits, KEY_OTH_WRITE);
-    assert_eq!(OTHER_SEARCH.bits, KEY_OTH_SEARCH);
-    assert_eq!(OTHER_LINK.bits, KEY_OTH_LINK);
-    assert_eq!(OTHER_SET_ATTRIBUTE.bits, KEY_OTH_SETATTR);
-    assert_eq!(OTHER_ALL.bits, KEY_OTH_ALL);
+    assert_eq!(Permission::OTHER_VIEW.bits, KEY_OTH_VIEW);
+    assert_eq!(Permission::OTHER_READ.bits, KEY_OTH_READ);
+    assert_eq!(Permission::OTHER_WRITE.bits, KEY_OTH_WRITE);
+    assert_eq!(Permission::OTHER_SEARCH.bits, KEY_OTH_SEARCH);
+    assert_eq!(Permission::OTHER_LINK.bits, KEY_OTH_LINK);
+    assert_eq!(Permission::OTHER_SET_ATTRIBUTE.bits, KEY_OTH_SETATTR);
+    assert_eq!(Permission::OTHER_ALL.bits, KEY_OTH_ALL);
 }