Skip to content

Commit 96d4bd4

Browse files
committed
Fix leftover 'unnecessary qualification' warnings on tests
Fix leftover 'unnecessary qualification' warnings generated when running the tests ('cargo test --features=testing') with newer rust compilers. Signed-off-by: Anderson Toshiyuki Sasaki <[email protected]>
1 parent c91fba3 commit 96d4bd4

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

keylime-agent/src/errors_handler.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ pub(crate) fn wrap_404<B>(
266266
#[cfg(test)]
267267
mod tests {
268268
use super::*;
269-
use actix_web::{middleware, test, App, Resource};
269+
use actix_web::{test, App, Resource};
270270
use core::future::Future;
271271
use serde::{Deserialize, Serialize};
272272
use serde_json::{json, Value};
@@ -379,7 +379,7 @@ mod tests {
379379
let mut app = test::init_service(
380380
App::new()
381381
.wrap(
382-
middleware::ErrorHandlers::new()
382+
ErrorHandlers::new()
383383
.handler(http::StatusCode::NOT_FOUND, wrap_404),
384384
)
385385
.app_data(

keylime-agent/src/keys_handler.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -970,10 +970,7 @@ mod tests {
970970

971971
// Send Shutdown message to the workers for a graceful shutdown
972972
keys_tx.send((KeyMessage::Shutdown, None)).await.unwrap(); //#[allow_ci]
973-
payload_tx
974-
.send(payloads::PayloadMessage::Shutdown)
975-
.await
976-
.unwrap(); //#[allow_ci]
973+
payload_tx.send(PayloadMessage::Shutdown).await.unwrap(); //#[allow_ci]
977974
arbiter.join();
978975
}
979976

keylime-agent/src/main.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1066,7 +1066,7 @@ mod testing {
10661066

10671067
/// CryptoTest error
10681068
#[error("CryptoTestError")]
1069-
CryptoTestError(#[from] crate::crypto::testing::CryptoTestError),
1069+
CryptoTestError(#[from] crypto::testing::CryptoTestError),
10701070

10711071
/// IO error
10721072
#[error("IOError")]
@@ -1078,7 +1078,7 @@ mod testing {
10781078

10791079
/// TPM error
10801080
#[error("TPMError")]
1081-
TPMError(#[from] keylime::tpm::TpmError),
1081+
TPMError(#[from] tpm::TpmError),
10821082

10831083
/// TSS esapi error
10841084
#[error("TSSError")]

0 commit comments

Comments
 (0)