Skip to content

Commit

Permalink
Fix leftover 'unnecessary qualification' warnings on tests
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
ansasaki committed May 21, 2024
1 parent c91fba3 commit 40178b6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions keylime-agent/src/errors_handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ pub(crate) fn wrap_404<B>(
#[cfg(test)]
mod tests {
use super::*;
use actix_web::{middleware, test, App, Resource};
use actix_web::{test, App, Resource};
use core::future::Future;
use serde::{Deserialize, Serialize};
use serde_json::{json, Value};
Expand Down Expand Up @@ -379,7 +379,7 @@ mod tests {
let mut app = test::init_service(
App::new()
.wrap(
middleware::ErrorHandlers::new()
ErrorHandlers::new()
.handler(http::StatusCode::NOT_FOUND, wrap_404),
)
.app_data(
Expand Down
2 changes: 1 addition & 1 deletion keylime-agent/src/keys_handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,7 @@ mod tests {
// Send Shutdown message to the workers for a graceful shutdown
keys_tx.send((KeyMessage::Shutdown, None)).await.unwrap(); //#[allow_ci]
payload_tx
.send(payloads::PayloadMessage::Shutdown)
.send(PayloadMessage::Shutdown)
.await
.unwrap(); //#[allow_ci]
arbiter.join();
Expand Down
4 changes: 2 additions & 2 deletions keylime-agent/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,7 @@ mod testing {

/// CryptoTest error
#[error("CryptoTestError")]
CryptoTestError(#[from] crate::crypto::testing::CryptoTestError),
CryptoTestError(#[from] crypto::testing::CryptoTestError),

/// IO error
#[error("IOError")]
Expand All @@ -1078,7 +1078,7 @@ mod testing {

/// TPM error
#[error("TPMError")]
TPMError(#[from] keylime::tpm::TpmError),
TPMError(#[from] tpm::TpmError),

/// TSS esapi error
#[error("TSSError")]
Expand Down

0 comments on commit 40178b6

Please sign in to comment.