Skip to content

Clippy warnings in 1.53 #727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 30, 2021
Merged

Clippy warnings in 1.53 #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c0af64
chore(*): clippy bool_assert_comparison warning
omertoast Jun 30, 2021
943d676
chore(http): clippy use collect instead of from_iter
omertoast Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/interledger-http/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use reqwest::{
Client, ClientBuilder, Response as HttpResponse,
};
use secrecy::{ExposeSecret, SecretString};
use std::{convert::TryFrom, iter::FromIterator, marker::PhantomData, sync::Arc, time::Duration};
use std::{convert::TryFrom, marker::PhantomData, sync::Arc, time::Duration};
use tracing::{error, trace};

/// The HttpClientService implements [OutgoingService](../../interledger_service/trait.OutgoingService)
Expand Down Expand Up @@ -158,7 +158,7 @@ async fn parse_packet_from_response(response: HttpResponse, ilp_address: Address
})
.await?;

let body = BytesMut::from_iter(body.into_iter());
let body = body.into_iter().collect::<BytesMut>();
match Packet::try_from(body) {
Ok(Packet::Fulfill(fulfill)) => Ok(fulfill),
Ok(Packet::Reject(reject)) => Err(reject),
Expand Down
48 changes: 19 additions & 29 deletions crates/interledger-http/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,69 +101,59 @@ mod tests {
let body_incorrect = r#"{"other_key": 0}"#;

// `content-type` should be provided.
assert_eq!(
request().body(body_correct).matches(&json_filter).await,
false
);
assert!(!request().body(body_correct).matches(&json_filter).await);

// Should accept only "application/json" or "application/json; charset=utf-8"
assert_eq!(
request()
assert!(
!request()
.body(body_correct)
.header("content-type", "text/plain")
.matches(&json_filter)
.await,
false
.await
);
assert_eq!(
assert!(
request()
.body(body_correct)
.header("content-type", "application/json")
.matches(&json_filter)
.await,
true
.await
);
assert_eq!(
request()
assert!(
!request()
.body(body_correct)
.header("content-type", "application/json; charset=ascii")
.matches(&json_filter)
.await,
false
.await
);
assert_eq!(
assert!(
request()
.body(body_correct)
.header("content-type", "application/json; charset=utf-8")
.matches(&json_filter)
.await,
true
.await
);
assert_eq!(
assert!(
request()
.body(body_correct)
.header("content-type", "application/json; charset=UTF-8")
.matches(&json_filter)
.await,
true
.await
);

// Should accept only bodies that can be deserialized
assert_eq!(
request()
assert!(
!request()
.body(body_incorrect)
.header("content-type", "application/json")
.matches(&json_filter)
.await,
false
.await
);
assert_eq!(
request()
assert!(
!request()
.body(body_incorrect)
.header("content-type", "application/json; charset=utf-8")
.matches(&json_filter)
.await,
false
.await
);
}
}
14 changes: 7 additions & 7 deletions crates/interledger-service-util/src/balance_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,8 +660,8 @@ mod tests {

tokio::time::delay_for(Duration::from_millis(100u64)).await;
mock.assert();
assert_eq!(*store.refunded_settlement.read(), false);
assert_eq!(*store.rejected_message.read(), false);
assert!(!*store.refunded_settlement.read());
assert!(!*store.rejected_message.read());
}

#[tokio::test]
Expand All @@ -683,8 +683,8 @@ mod tests {

tokio::time::delay_for(Duration::from_millis(100u64)).await;
mock.assert();
assert_eq!(*store.refunded_settlement.read(), false);
assert_eq!(*store.rejected_message.read(), false);
assert!(!*store.refunded_settlement.read());
assert!(!*store.rejected_message.read());
}

#[tokio::test]
Expand All @@ -706,8 +706,8 @@ mod tests {

tokio::time::delay_for(Duration::from_millis(100u64)).await;
mock.assert();
assert_eq!(*store.refunded_settlement.read(), true);
assert_eq!(*store.rejected_message.read(), false);
assert!(*store.refunded_settlement.read());
assert!(!*store.rejected_message.read());
}

#[tokio::test]
Expand All @@ -734,7 +734,7 @@ mod tests {

tokio::time::delay_for(Duration::from_millis(100u64)).await;
mock.assert();
assert_eq!(*store.rejected_message.read(), true);
assert!(*store.rejected_message.read());
}

#[derive(Debug, Clone)]
Expand Down
10 changes: 5 additions & 5 deletions crates/interledger-service-util/src/rate_limit_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ mod tests {
let mut service = RateLimitService::new(store.clone(), next);
let fulfill = service.handle_request(TEST_REQUEST.clone()).await.unwrap();
assert_eq!(fulfill.data(), b"test data");
assert_eq!(*store.was_refunded.read(), false);
assert!(!*store.was_refunded.read());
}

#[tokio::test]
Expand All @@ -208,7 +208,7 @@ mod tests {
.await
.unwrap_err();
assert_eq!(reject.code(), ErrorCode::T00_INTERNAL_ERROR);
assert_eq!(*store.was_refunded.read(), true);
assert!(*store.was_refunded.read());
}

#[tokio::test]
Expand All @@ -227,7 +227,7 @@ mod tests {
.await
.unwrap_err();
assert_eq!(reject.code(), ErrorCode::T05_RATE_LIMITED);
assert_eq!(*store.was_refunded.read(), false);
assert!(!*store.was_refunded.read());
}

#[tokio::test]
Expand All @@ -246,7 +246,7 @@ mod tests {
.await
.unwrap_err();
assert_eq!(reject.code(), ErrorCode::T04_INSUFFICIENT_LIQUIDITY);
assert_eq!(*store.was_refunded.read(), false);
assert!(!*store.was_refunded.read());
}

#[tokio::test]
Expand All @@ -265,7 +265,7 @@ mod tests {
.await
.unwrap_err();
assert_eq!(reject.code(), ErrorCode::T00_INTERNAL_ERROR);
assert_eq!(*store.was_refunded.read(), false);
assert!(!*store.was_refunded.read());
}

#[derive(Debug, Clone)]
Expand Down