Skip to content

Commit

Permalink
run cargo fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@osobiehl
osobiehl committed Apr 3, 2024
1 parent 436a263 commit f313afb
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion benches/server.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ fn bench_server_with_request(b: &mut test::Bencher) {
});

let server_port = rx.blocking_recv().unwrap();
let mut client = rt.block_on(async {
let client = rt.block_on(async {
UdpCoAPClient::new_udp(format!("127.0.0.1:{}", server_port))
.await
.unwrap()
Expand Down
2 changes: 1 addition & 1 deletion examples/echo_with_dtls.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ async fn main() {
.unwrap(),
};

let mut client = CoAPClient::from_dtls_config(dtls_config)
let client = CoAPClient::from_dtls_config(dtls_config)
.await
.expect("could not create client");
let domain = format!("127.0.0.1:{}", server_port);
Expand Down
24 changes: 12 additions & 12 deletions src/client.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ use crate::request::RequestBuilder;
use alloc::string::String;
use alloc::vec::Vec;
use coap_lite::{
block_handler::{extending_splice, BlockValue, RequestCacheKey},
block_handler::{extending_splice, BlockValue},
error::HandlingError,
CoapOption, CoapRequest, CoapResponse, MessageClass, MessageType, ObserveOption, Packet,
RequestType as Method, ResponseType as Status,
};
use core::mem;
use core::ops::Deref;

use futures::Future;
use log::*;
use lru_time_cache::LruCache;

use regex::Regex;
use std::{
collections::BTreeMap,
Expand Down Expand Up @@ -507,7 +507,7 @@ impl<T: Transport + 'static> CoAPClient<T> {
data: Option<Vec<u8>>,
) -> IoResult<CoapResponse> {
let (domain, port, path, queries) = Self::parse_coap_url(url)?;
let mut client = UdpCoAPClient::new_udp((domain.as_str(), port)).await?;
let client = UdpCoAPClient::new_udp((domain.as_str(), port)).await?;
let request = RequestBuilder::new(&path, method)
.queries(queries)
.domain(domain)
Expand Down Expand Up @@ -581,7 +581,7 @@ impl<T: Transport + 'static> CoAPClient<T> {
/// requests. This method will add observe flags and a message id as a fallback
/// Use this method if you plan on re-using the same client for requests
pub async fn observe_with<H: FnMut(Packet) + Send + 'static>(
mut self,
self,
request: CoapRequest<SocketAddr>,
mut handler: H,
) -> IoResult<oneshot::Sender<ObserveMessage>> {
Expand Down Expand Up @@ -944,7 +944,7 @@ mod test {
#[tokio::test]
async fn test_get() {
let domain = "coap.me";
let mut client = UdpCoAPClient::new_udp((domain, 5683)).await.unwrap();
let client = UdpCoAPClient::new_udp((domain, 5683)).await.unwrap();
let resp = client
.send(
RequestBuilder::request_path(
Expand Down Expand Up @@ -975,7 +975,7 @@ mod test {
#[tokio::test]
async fn test_post() {
let domain = "coap.me";
let mut client = UdpCoAPClient::new_udp((domain, 5683)).await.unwrap();
let client = UdpCoAPClient::new_udp((domain, 5683)).await.unwrap();
let resp = client
.send(
RequestBuilder::request_path(
Expand Down Expand Up @@ -1007,7 +1007,7 @@ mod test {
#[tokio::test]
async fn test_put() {
let domain = "coap.me";
let mut client = UdpCoAPClient::new_udp((domain, 5683)).await.unwrap();
let client = UdpCoAPClient::new_udp((domain, 5683)).await.unwrap();
let resp = client
.send(
RequestBuilder::new("/create1", Method::Put)
Expand Down Expand Up @@ -1035,7 +1035,7 @@ mod test {
#[tokio::test]
async fn test_delete() {
let domain = "coap.me";
let mut client = UdpCoAPClient::new_udp((domain, 5683)).await.unwrap();
let client = UdpCoAPClient::new_udp((domain, 5683)).await.unwrap();
let resp = client
.send(
RequestBuilder::new("/validate", Method::Delete)
Expand Down Expand Up @@ -1220,7 +1220,7 @@ mod test {
.unwrap();

let server_addr = format!("127.0.0.1:{}", server_port);
let mut client = get_faulty_client(&server_addr, 2).await;
let client = get_faulty_client(&server_addr, 2).await;
let mut request = CoapRequest::new();
request.set_method(Method::Get);
request.set_path("/Rust");
Expand All @@ -1232,7 +1232,7 @@ mod test {
}

async fn do_wait_request<T: Transport + 'static>(
mut client: CoAPClient<T>,
client: CoAPClient<T>,
path: &str,
token: Vec<u8>,
wait_ms: u64,
Expand Down Expand Up @@ -1402,7 +1402,7 @@ mod test {
.await
.unwrap();

let mut client = UdpCoAPClient::new_udp(format!("127.0.0.1:{}", server_port))
let client = UdpCoAPClient::new_udp(format!("127.0.0.1:{}", server_port))
.await
.unwrap();
let resp = client
Expand Down
8 changes: 4 additions & 4 deletions src/dtls.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ mod test {
.unwrap(),
};

let mut client = CoAPClient::from_dtls_config(dtls_config)
let client = CoAPClient::from_dtls_config(dtls_config)
.await
.expect("could not create client");
let domain = format!("127.0.0.1:{}", server_port);
Expand Down Expand Up @@ -358,7 +358,7 @@ mod test {
.unwrap(),
};

let mut client = CoAPClient::from_dtls_config(dtls_config)
let client = CoAPClient::from_dtls_config(dtls_config)
.await
.expect("could not create client");
let domain = format!("127.0.0.1:{}", server_port);
Expand Down Expand Up @@ -427,7 +427,7 @@ mod test {
.unwrap(),
};

let mut client = CoAPClient::from_dtls_config(dtls_config)
let client = CoAPClient::from_dtls_config(dtls_config)
.await
.expect("could not create client");
let domain = format!("127.0.0.1:{}", server_port);
Expand Down Expand Up @@ -483,7 +483,7 @@ mod test {
.unwrap(),
};

let mut client = CoAPClient::from_dtls_config(dtls_config)
let client = CoAPClient::from_dtls_config(dtls_config)
.await
.expect("could not create client");
let domain = format!("127.0.0.1:{}", dtls);
Expand Down
8 changes: 4 additions & 4 deletions src/observer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ mod test {

let server_address = &format!("127.0.0.1:{}", server_port);

let mut client = UdpCoAPClient::new_udp(server_address).await.unwrap();
let client = UdpCoAPClient::new_udp(server_address).await.unwrap();

tx.send(step).unwrap();
let mut request = CoapRequest::new();
Expand All @@ -483,7 +483,7 @@ mod test {
let payload1_clone = payload1.clone();
let payload2_clone = payload2.clone();

let mut client2 = client.clone();
let client2 = client.clone();

let mut receive_step = 1;
client
Expand Down Expand Up @@ -534,9 +534,9 @@ mod test {

let server_address = &format!("127.0.0.1:{}", server_port);

let mut client = UdpCoAPClient::new_udp(server_address).await.unwrap();
let client = UdpCoAPClient::new_udp(server_address).await.unwrap();

let mut client3 = client.clone();
let client3 = client.clone();

let mut request = RequestBuilder::new(path, coap_lite::RequestType::Put)
.token(Some(vec![1]))
Expand Down
18 changes: 9 additions & 9 deletions src/server.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ pub mod test {
.await
.unwrap();

let mut client = UdpCoAPClient::new_udp(format!("127.0.0.1:{}", server_port))
let client = UdpCoAPClient::new_udp(format!("127.0.0.1:{}", server_port))
.await
.unwrap();
let mut request = CoapRequest::new();
Expand Down Expand Up @@ -591,7 +591,7 @@ pub mod test {
}
let payload_size = v.len();
let server_string = format!("127.0.0.1:{}", server_port);
let mut client = UdpCoAPClient::new_udp(server_string.clone()).await.unwrap();
let client = UdpCoAPClient::new_udp(server_string.clone()).await.unwrap();

let request = RequestBuilder::new("/large", RequestType::Put)
.data(Some(v))
Expand All @@ -618,7 +618,7 @@ pub mod test {
async fn test_echo_server_v6() {
let server_port = spawn_server("::1:0", request_handler).recv().await.unwrap();

let mut client = UdpCoAPClient::new_udp(format!("::1:{}", server_port))
let client = UdpCoAPClient::new_udp(format!("::1:{}", server_port))
.await
.unwrap();
let mut request = CoapRequest::new();
Expand All @@ -645,7 +645,7 @@ pub mod test {
.await
.unwrap();

let mut client = UdpCoAPClient::new_udp(format!("127.0.0.1:{}", server_port))
let client = UdpCoAPClient::new_udp(format!("127.0.0.1:{}", server_port))
.await
.unwrap();
let mut packet = CoapRequest::new();
Expand All @@ -668,7 +668,7 @@ pub mod test {
async fn test_echo_server_no_token_v6() {
let server_port = spawn_server("::1:0", request_handler).recv().await.unwrap();

let mut client = UdpCoAPClient::new_udp(format!("::1:{}", server_port))
let client = UdpCoAPClient::new_udp(format!("::1:{}", server_port))
.await
.unwrap();
let mut packet = CoapRequest::new();
Expand Down Expand Up @@ -701,7 +701,7 @@ pub mod test {
.await
.unwrap();

let mut client = UdpCoAPClient::new_udp(format!("127.0.0.1:{}", server_port))
let client = UdpCoAPClient::new_udp(format!("127.0.0.1:{}", server_port))
.await
.unwrap();

Expand Down Expand Up @@ -737,7 +737,7 @@ pub mod test {
step = 2;
tx.send(step).unwrap();
request.message.payload = payload2.clone();
let mut client2 = UdpCoAPClient::new_udp(format!("127.0.0.1:{}", server_port))
let client2 = UdpCoAPClient::new_udp(format!("127.0.0.1:{}", server_port))
.await
.unwrap();
let _ = client2.send(request).await.unwrap();
Expand Down Expand Up @@ -788,7 +788,7 @@ pub mod test {
.await
.unwrap();

let mut client = UdpCoAPClient::new_udp(format!("127.0.0.1:{}", server_port))
let client = UdpCoAPClient::new_udp(format!("127.0.0.1:{}", server_port))
.await
.unwrap();
let mut request = CoapRequest::new();
Expand Down Expand Up @@ -847,7 +847,7 @@ pub mod test {
.await
.unwrap();

let mut client = UdpCoAPClient::new_udp(format!("::1:{}", server_port))
let client = UdpCoAPClient::new_udp(format!("::1:{}", server_port))
.await
.unwrap();
let mut request = CoapRequest::new();
Expand Down

0 comments on commit f313afb

Please sign in to comment.