fixup! tests: Allow more configuration for test token

Author: Jakuje

cryptoki/tests/basic.rs

@@ -1200,7 +1200,7 @@ fn get_attribute_info_test() -> TestResult {
         session.generate_key_pair(&mechanism, &pub_key_template, &priv_key_template)?;
 
     let pub_attribs = vec![AttributeType::PublicExponent, AttributeType::Modulus];
-    let mut priv_attribs = [
+    let priv_attribs = [
         AttributeType::PublicExponent,
         AttributeType::Modulus,
         AttributeType::PrivateExponent,

cryptoki/tests/common.rs

@@ -1,7 +1,6 @@
 // Copyright 2021 Contributors to the Parsec project.
 // SPDX-License-Identifier: Apache-2.0
-use cryptoki::context::{CInitializeArgs, Function, Pkcs11};
-use cryptoki::error::{Error, RvError};
+use cryptoki::context::{CInitializeArgs, Pkcs11};
 use cryptoki::session::UserType;
 use cryptoki::slot::Slot;
 use cryptoki::types::AuthPin;
@@ -13,10 +12,7 @@ pub static USER_PIN: &str = "fedcba";
 pub static SO_PIN: &str = "abcdef";
 
 fn get_token_label() -> Option<String> {
-    match env::var("TEST_TOKEN_LABEL") {
-        Ok(s) => Some(s),
-        Err(_) => None,
-    }
+    env::var("TEST_TOKEN_LABEL").ok()
 }
 
 fn skip_token_init() -> bool {
@@ -43,7 +39,7 @@ fn get_slot(pkcs11: &Pkcs11) -> Slot {
     // find a slot, get the first one or one with name specified in the environment variable
     let mut slots = pkcs11.get_slots_with_token().unwrap();
     match get_token_label() {
-        None => return slots.remove(0),
+        None => slots.remove(0),
         Some(label) => {
             for s in slots {
                 let ti = pkcs11.get_token_info(s).unwrap();
@@ -53,7 +49,7 @@ fn get_slot(pkcs11: &Pkcs11) -> Slot {
             }
             panic!("No token with Token Label `{label}` found");
         }
-    };
+    }
 }
 
 pub fn init_pins() -> (Pkcs11, Slot) {
@@ -66,7 +62,7 @@ pub fn init_pins() -> (Pkcs11, Slot) {
 
     if !skip_token_init() {
         let so_pin = AuthPin::new(SO_PIN.into());
-        let res = pkcs11.init_token(slot, &so_pin, "Test Token");
+        let _ = pkcs11.init_token(slot, &so_pin, "Test Token");
         {
             // open a session
             let session = pkcs11.open_rw_session(slot).unwrap();