tests: use byte literals where possible

Author: mathstuf

src/tests/add.rs

@@ -81,7 +81,7 @@ fn max_user_description() {
     let mut keyring = utils::new_test_keyring();
     // Subtract one because the NUL is added in the kernel API.
     let maxdesc: String = iter::repeat('a').take(*PAGE_SIZE - 1).collect();
-    let res = keyring.add_key::<User, _, _>(maxdesc.as_ref(), "payload".as_bytes());
+    let res = keyring.add_key::<User, _, _>(maxdesc.as_ref(), &b"payload"[..]);
     // If the user's quota is smaller than this, it's an error.
     if KEY_INFO.maxbytes < *PAGE_SIZE {
         assert_eq!(res.unwrap_err(), errno::Errno(libc::EDQUOT));
@@ -99,7 +99,7 @@ fn overlong_user_description() {
     // so this is being ignored here.
     let toolarge: String = iter::repeat('a').take(*PAGE_SIZE).collect();
     let err = keyring
-        .add_key::<User, _, _>(toolarge.as_ref(), "payload".as_bytes())
+        .add_key::<User, _, _>(toolarge.as_ref(), &b"payload"[..])
         .unwrap_err();
     assert_eq!(err, errno::Errno(libc::EINVAL));
 }
@@ -108,15 +108,15 @@ fn overlong_user_description() {
 fn invalid_keyring() {
     let mut keyring = utils::invalid_keyring();
     let err = keyring
-        .add_key::<User, _, _>("invalid_keyring", "payload".as_bytes())
+        .add_key::<User, _, _>("invalid_keyring", &b"payload"[..])
         .unwrap_err();
     assert_eq!(err, errno::Errno(libc::EINVAL));
 }
 
 #[test]
 fn add_key_to_non_keyring() {
     let mut keyring = utils::new_test_keyring();
-    let expected = "stuff".as_bytes();
+    let expected = &b"stuff"[..];
     let key = keyring
         .add_key::<User, _, _>("add_key_to_non_keyring", expected)
         .unwrap();
@@ -131,7 +131,7 @@ fn add_key_to_non_keyring() {
 #[test]
 fn add_keyring_to_non_keyring() {
     let mut keyring = utils::new_test_keyring();
-    let expected = "stuff".as_bytes();
+    let expected = &b"stuff"[..];
     let key = keyring
         .add_key::<User, _, _>("add_keyring_to_non_keyring", expected)
         .unwrap();
@@ -147,7 +147,7 @@ fn add_keyring_to_non_keyring() {
 fn add_key() {
     let mut keyring = utils::new_test_keyring();
 
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = keyring.add_key::<User, _, _>("add_key", payload).unwrap();
     assert_eq!(key.read().unwrap(), payload);
 }
@@ -168,11 +168,11 @@ fn add_key_replace() {
 
     let description = "add_key_replace";
 
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = keyring.add_key::<User, _, _>(description, payload).unwrap();
     assert_eq!(key.read().unwrap(), payload);
 
-    let payload = "updated_payload".as_bytes();
+    let payload = &b"updated_payload"[..];
     let key_updated = keyring.add_key::<User, _, _>(description, payload).unwrap();
     assert_eq!(key, key_updated);
     assert_eq!(key.read().unwrap(), payload);

src/tests/clear.rs

@@ -40,7 +40,7 @@ fn invalid_keyring() {
 fn clear_non_keyring() {
     let mut keyring = utils::new_test_keyring();
     let key = keyring
-        .add_key::<User, _, _>("clear_non_keyring", "payload".as_bytes())
+        .add_key::<User, _, _>("clear_non_keyring", &b"payload"[..])
         .unwrap();
 
     // Try clearing a non-keyring.
@@ -96,7 +96,7 @@ fn clear_keyring_one_key() {
     let key_desc = "clear_keyring:key";
 
     // Create a key.
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     keyring.add_key::<User, _, _>(key_desc, payload).unwrap();
 
     let (keys, keyrings) = keyring.read().unwrap();
@@ -122,7 +122,7 @@ fn clear_keyring_many_keys() {
     assert_eq!(keyrings.len(), 0);
 
     let count = 40;
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let mut descs = Vec::with_capacity(count);
     for i in 0..count {
         let key_desc = format!("clear_keyring:key{:02}", i);

src/tests/describe.rs

@@ -48,7 +48,7 @@ fn invalid_keyring() {
 fn non_existent_key() {
     let mut keyring = utils::new_test_keyring();
     let key = keyring
-        .add_key::<User, _, _>("non_existent_key", "payload".as_bytes())
+        .add_key::<User, _, _>("non_existent_key", &b"payload"[..])
         .unwrap();
 
     keyring.unlink_key(&key).unwrap();
@@ -78,7 +78,7 @@ fn describe_key() {
     let mut keyring = utils::new_test_keyring();
     let description = "describe_key";
     let key = keyring
-        .add_key::<User, _, _>(description, "payload".as_bytes())
+        .add_key::<User, _, _>(description, &b"payload"[..])
         .unwrap();
 
     let perms = Permission::POSSESSOR_ALL | Permission::USER_VIEW;
@@ -96,7 +96,7 @@ fn describe_key_no_perm() {
     let mut keyring = utils::new_test_keyring();
     let description = "describe_key_no_perm";
     let mut key = keyring
-        .add_key::<User, _, _>(description, "payload".as_bytes())
+        .add_key::<User, _, _>(description, &b"payload"[..])
         .unwrap();
 
     let old_perms = key.description().unwrap().perms;
@@ -116,7 +116,7 @@ fn describe_key_no_perm() {
 fn describe_revoked_key() {
     let mut keyring = utils::new_test_keyring();
     let key = keyring
-        .add_key::<User, _, _>("describe_revoked_key", "payload".as_bytes())
+        .add_key::<User, _, _>("describe_revoked_key", &b"payload"[..])
         .unwrap();
 
     let key_mirror = unsafe { Key::new(key.serial()) };

src/tests/instantiate.rs

@@ -36,7 +36,7 @@ fn instantiate_invalid_key() {
     let key = utils::invalid_key();
     let manager = KeyManager::test_new(key);
 
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let err = manager.instantiate(None, payload).unwrap_err();
     assert_eq!(err, errno::Errno(libc::EPERM));
 }
@@ -65,14 +65,14 @@ fn negate_invalid_key() {
 #[test]
 fn instantiate_into_not_key() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = keyring
         .add_key::<User, _, _>("instantiate_into_not_key", payload)
         .unwrap();
     let mut not_a_keyring = utils::key_as_keyring(&key);
     let manager = KeyManager::test_new(key);
 
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let err = manager
         .instantiate(&mut not_a_keyring, payload)
         .unwrap_err();
@@ -83,7 +83,7 @@ fn instantiate_into_not_key() {
 #[test]
 fn reject_into_not_key() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = keyring
         .add_key::<User, _, _>("reject_into_not_key", payload)
         .unwrap();
@@ -102,7 +102,7 @@ fn reject_into_not_key() {
 #[test]
 fn negate_into_not_key() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = keyring
         .add_key::<User, _, _>("negate_into_not_key", payload)
         .unwrap();
@@ -118,7 +118,7 @@ fn negate_into_not_key() {
 #[test]
 fn instantiate_already_instantiated() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = keyring
         .add_key::<User, _, _>("instantiate_already_instantiated", payload)
         .unwrap();
@@ -131,7 +131,7 @@ fn instantiate_already_instantiated() {
 #[test]
 fn reject_already_instantiated() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = keyring
         .add_key::<User, _, _>("reject_already_instantiated", payload)
         .unwrap();
@@ -146,7 +146,7 @@ fn reject_already_instantiated() {
 #[test]
 fn negate_already_instantiated() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = keyring
         .add_key::<User, _, _>("negate_already_instantiated", payload)
         .unwrap();
@@ -160,7 +160,7 @@ fn negate_already_instantiated() {
 #[test]
 fn instantiate_unlinked_key() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = keyring
         .add_key::<User, _, _>("instantiate_unlinked_key", payload)
         .unwrap();
@@ -177,7 +177,7 @@ fn instantiate_unlinked_key() {
 #[test]
 fn reject_unlinked_key() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = keyring
         .add_key::<User, _, _>("reject_unlinked_key", payload)
         .unwrap();
@@ -196,7 +196,7 @@ fn reject_unlinked_key() {
 #[test]
 fn negate_unlinked_key() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = keyring
         .add_key::<User, _, _>("negate_unlinked_key", payload)
         .unwrap();

src/tests/invalidate.rs

@@ -57,7 +57,7 @@ fn invalid_keyring() {
 #[test]
 fn unlinked_key() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = keyring
         .add_key::<User, _, _>("unlinked_key", payload)
         .unwrap();
@@ -79,7 +79,7 @@ fn invalidate_key() {
         assert!(keyrings.is_empty());
     }
 
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = keyring
         .add_key::<User, _, _>("invalidate_key", payload)
         .unwrap();
@@ -105,7 +105,7 @@ fn invalidate_keyring() {
         assert!(keyrings.is_empty());
     }
 
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = keyring
         .add_key::<User, _, _>("invalidate_keyring", payload)
         .unwrap();

src/tests/link.rs

@@ -50,7 +50,7 @@ fn invalid_source() {
 #[test]
 fn link_to_non_keyring() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = keyring
         .add_key::<User, _, _>("link_to_non_keyring", payload)
         .unwrap();
@@ -66,7 +66,7 @@ fn link_to_non_keyring() {
 #[test]
 fn link_unlinked_key() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = keyring
         .add_key::<User, _, _>("link_unlinked_key", payload)
         .unwrap();
@@ -82,7 +82,7 @@ fn link_unlinked_key() {
 #[test]
 fn link_into_unlinked_keyring() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = keyring
         .add_key::<User, _, _>("link_into_unlinked_keyring", payload)
         .unwrap();
@@ -231,7 +231,7 @@ fn multiply_link_key_into_keyring() {
     assert_eq!(keyrings.len(), 1);
     assert_eq!(keyrings[0], new_keyring);
 
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = new_keyring
         .add_key::<User, _, _>("multiply_link_key_into_keyring_key", payload)
         .unwrap();

src/tests/newring.rs

@@ -55,7 +55,7 @@ fn unlinked_keyring() {
 #[test]
 fn not_a_keyring() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let key = keyring
         .add_key::<User, _, _>("not_a_keyring_key", payload)
         .unwrap();

src/tests/permitting.rs

@@ -75,7 +75,7 @@ fn invalid_keyring_chmod() {
 #[test]
 fn invalid_key_permissions() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let mut key = keyring
         .add_key::<User, _, _>("invalid_key_permissions", payload)
         .unwrap();
@@ -99,7 +99,7 @@ fn invalid_keyring_permissions() {
 #[test]
 fn unlinked_key_chown() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let mut key = keyring
         .add_key::<User, _, _>("unlinked_key_chown", payload)
         .unwrap();
@@ -114,7 +114,7 @@ fn unlinked_key_chown() {
 #[test]
 fn unlinked_key_chgrp() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let mut key = keyring
         .add_key::<User, _, _>("unlinked_key_chgrp", payload)
         .unwrap();
@@ -129,7 +129,7 @@ fn unlinked_key_chgrp() {
 #[test]
 fn unlinked_key_chmod() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let mut key = keyring
         .add_key::<User, _, _>("unlinked_key_chmod", payload)
         .unwrap();
@@ -161,7 +161,7 @@ fn chown_keyring() {
 #[test]
 fn chown_key() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let mut key = keyring.add_key::<User, _, _>("chown_key", payload).unwrap();
 
     if *UID == 0 {
@@ -207,7 +207,7 @@ fn set_each_permission_bit() {
     let required_permissions = Permission::USER_SET_ATTRIBUTE | Permission::USER_VIEW;
 
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let mut key = keyring
         .add_key::<User, _, _>("set_each_permission_bit", payload)
         .unwrap();
@@ -223,7 +223,7 @@ fn set_each_permission_bit() {
 #[test]
 fn cannot_view_via_group() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let mut key = keyring
         .add_key::<User, _, _>("cannot_view_via_group", payload)
         .unwrap();
@@ -238,7 +238,7 @@ fn cannot_view_via_group() {
 #[test]
 fn cannot_view_via_other() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let mut key = keyring
         .add_key::<User, _, _>("cannot_view_via_other", payload)
         .unwrap();
@@ -253,7 +253,7 @@ fn cannot_view_via_other() {
 #[test]
 fn remove_setattr() {
     let mut keyring = utils::new_test_keyring();
-    let payload = "payload".as_bytes();
+    let payload = &b"payload"[..];
     let mut key = keyring
         .add_key::<User, _, _>("remove_setattr", payload)
         .unwrap();