Skip to content

Commit 94fda8e

Browse files
CovertnessCovertness
authored
Merge pull request #63 from pranav-bhatt/master
Bumped dependency versions
2 parents aac20c3 + d980f37 commit 94fda8e

File tree

10 files changed

+584
-349
lines changed

10 files changed

+584
-349
lines changed

‎Cargo.toml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,17 @@ keywords = ["CoAP"]
1111
edition = "2018"
1212

1313
[dependencies]
14-
serde = { version= "1.0.88", features= [ "derive" ], default-features = false }
15-
url = "1.7.2"
16-
num-derive = "0.2.4"
17-
num-traits = "0.2.6"
18-
log = "0.4.6"
19-
regex = "1.1.0"
20-
tokio = {version = "0.2", features = ["full"]}
21-
tokio-util = {version = "0.2", features = ["codec", "udp"]}
22-
futures = "0.3"
23-
bytes = "0.5"
14+
serde = { version= "^1.0", features= [ "derive" ], default-features = false }
15+
url = "^2.2"
16+
num-derive = "^0.3"
17+
num-traits = "^0.2"
18+
log = "^0.4"
19+
regex = "^1.5"
20+
tokio = {version = "^1.7", features = ["full"]}
21+
tokio-util = {version = "^0.6", features = ["codec","net"]}
22+
tokio-stream = {version = "^0.1", features = ["time"]}
23+
futures = "^0.3"
24+
bytes = "^1.0"
2425
coap-lite = "^0.4"
2526

2627
[dev-dependencies]

‎benches/server.rs‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22

33
extern crate test;
44

5-
use std::{
6-
thread,
7-
sync::mpsc,
8-
};
9-
use coap_lite::{CoapRequest, MessageType, CoapOption};
10-
use coap::{Server, CoAPClient};
5+
use coap::{CoAPClient, Server};
6+
use coap_lite::{CoapOption, CoapRequest, MessageType};
7+
use std::{sync::mpsc, thread};
118
use tokio::runtime::Runtime;
129

1310
#[bench]
@@ -20,20 +17,23 @@ fn bench_server_with_request(b: &mut test::Bencher) {
2017

2118
tx.send(server.socket_addr().unwrap().port()).unwrap();
2219

23-
server.run(async move |request| {
24-
let uri_path = request.get_path().to_string();
25-
26-
return match request.response {
27-
Some(mut response) => {
28-
response.message.payload = uri_path.as_bytes().to_vec();
29-
Some(response)
30-
}
31-
_ => None,
32-
};
33-
}).await.unwrap();
20+
server
21+
.run(async move |request| {
22+
let uri_path = request.get_path().to_string();
23+
24+
return match request.response {
25+
Some(mut response) => {
26+
response.message.payload = uri_path.as_bytes().to_vec();
27+
Some(response)
28+
}
29+
_ => None,
30+
};
31+
})
32+
.await
33+
.unwrap();
3434
});
3535
});
36-
36+
3737
let server_port = rx.recv().unwrap();
3838
let client = CoAPClient::new(format!("127.0.0.1:{}", server_port)).unwrap();
3939

@@ -42,12 +42,14 @@ fn bench_server_with_request(b: &mut test::Bencher) {
4242
request.message.header.set_type(MessageType::Confirmable);
4343
request.message.header.set_code("0.01");
4444
request.message.header.message_id = 1;
45-
request.message.set_token(vec!(0x51, 0x55, 0x77, 0xE8));
46-
request.message.add_option(CoapOption::UriPath, "test".to_string().into_bytes());
45+
request.message.set_token(vec![0x51, 0x55, 0x77, 0xE8]);
46+
request
47+
.message
48+
.add_option(CoapOption::UriPath, "test".to_string().into_bytes());
4749

4850
b.iter(|| {
4951
client.send(&request).unwrap();
5052
let recv_packet = client.receive().unwrap();
5153
assert_eq!(recv_packet.message.payload, b"test".to_vec());
5254
});
53-
}
55+
}

‎examples/client.rs‎

Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
extern crate coap;
22

3+
use coap::CoAPClient;
34
use std::io;
45
use std::io::ErrorKind;
5-
use coap::CoAPClient;
66

77
fn main() {
88
println!("GET url:");
@@ -21,20 +21,21 @@ fn main() {
2121
example_observe();
2222
}
2323

24-
2524
fn example_get() {
2625
let url = "coap://127.0.0.1:5683/hello/get";
2726
println!("Client request: {}", url);
2827

2928
match CoAPClient::get(url) {
3029
Ok(response) => {
31-
println!("Server reply: {}",
32-
String::from_utf8(response.message.payload).unwrap());
30+
println!(
31+
"Server reply: {}",
32+
String::from_utf8(response.message.payload).unwrap()
33+
);
3334
}
3435
Err(e) => {
3536
match e.kind() {
36-
ErrorKind::WouldBlock => println!("Request timeout"), // Unix
37-
ErrorKind::TimedOut => println!("Request timeout"), // Windows
37+
ErrorKind::WouldBlock => println!("Request timeout"), // Unix
38+
ErrorKind::TimedOut => println!("Request timeout"), // Windows
3839
_ => println!("Request error: {:?}", e),
3940
}
4041
}
@@ -48,13 +49,15 @@ fn example_post() {
4849

4950
match CoAPClient::post(url, data) {
5051
Ok(response) => {
51-
println!("Server reply: {}",
52-
String::from_utf8(response.message.payload).unwrap());
52+
println!(
53+
"Server reply: {}",
54+
String::from_utf8(response.message.payload).unwrap()
55+
);
5356
}
5457
Err(e) => {
5558
match e.kind() {
56-
ErrorKind::WouldBlock => println!("Request timeout"), // Unix
57-
ErrorKind::TimedOut => println!("Request timeout"), // Windows
59+
ErrorKind::WouldBlock => println!("Request timeout"), // Unix
60+
ErrorKind::TimedOut => println!("Request timeout"), // Windows
5861
_ => println!("Request error: {:?}", e),
5962
}
6063
}
@@ -68,13 +71,15 @@ fn example_put() {
6871

6972
match CoAPClient::put(url, data) {
7073
Ok(response) => {
71-
println!("Server reply: {}",
72-
String::from_utf8(response.message.payload).unwrap());
74+
println!(
75+
"Server reply: {}",
76+
String::from_utf8(response.message.payload).unwrap()
77+
);
7378
}
7479
Err(e) => {
7580
match e.kind() {
76-
ErrorKind::WouldBlock => println!("Request timeout"), // Unix
77-
ErrorKind::TimedOut => println!("Request timeout"), // Windows
81+
ErrorKind::WouldBlock => println!("Request timeout"), // Unix
82+
ErrorKind::TimedOut => println!("Request timeout"), // Windows
7883
_ => println!("Request error: {:?}", e),
7984
}
8085
}
@@ -87,13 +92,15 @@ fn example_delete() {
8792

8893
match CoAPClient::delete(url) {
8994
Ok(response) => {
90-
println!("Server reply: {}",
91-
String::from_utf8(response.message.payload).unwrap());
95+
println!(
96+
"Server reply: {}",
97+
String::from_utf8(response.message.payload).unwrap()
98+
);
9299
}
93100
Err(e) => {
94101
match e.kind() {
95-
ErrorKind::WouldBlock => println!("Request timeout"), // Unix
96-
ErrorKind::TimedOut => println!("Request timeout"), // Windows
102+
ErrorKind::WouldBlock => println!("Request timeout"), // Unix
103+
ErrorKind::TimedOut => println!("Request timeout"), // Windows
97104
_ => println!("Request error: {:?}", e),
98105
}
99106
}
@@ -102,11 +109,16 @@ fn example_delete() {
102109

103110
fn example_observe() {
104111
let mut client = CoAPClient::new("127.0.0.1:5683").unwrap();
105-
client.observe("/hello/put", |msg| {
106-
println!("resource changed {}", String::from_utf8(msg.payload).unwrap());
107-
}).unwrap();
112+
client
113+
.observe("/hello/put", |msg| {
114+
println!(
115+
"resource changed {}",
116+
String::from_utf8(msg.payload).unwrap()
117+
);
118+
})
119+
.unwrap();
108120

109121
println!("Press any key to stop...");
110122

111123
io::stdin().read_line(&mut String::new()).unwrap();
112-
}
124+
}

‎examples/client_and_server.rs‎

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,38 @@
22

33
extern crate coap;
44

5+
use coap::{CoAPClient, Server};
56
use std::thread;
6-
use coap::{Server, CoAPClient};
77
use tokio::runtime::Runtime;
88

99
fn main() {
1010
thread::spawn(move || {
11-
Runtime::new().unwrap().block_on(async move {
11+
Runtime::new().unwrap().block_on(async move {
1212
let mut server = Server::new("127.0.0.1:5683").unwrap();
13-
14-
server.run(async move |request| {
15-
let uri_path = request.get_path().to_string();
1613

17-
return match request.response {
18-
Some(mut response) => {
19-
response.message.payload = uri_path.as_bytes().to_vec();
20-
Some(response)
21-
}
22-
_ => None,
23-
};
24-
}).await.unwrap();
25-
});
26-
});
14+
server
15+
.run(async move |request| {
16+
let uri_path = request.get_path().to_string();
17+
18+
return match request.response {
19+
Some(mut response) => {
20+
response.message.payload = uri_path.as_bytes().to_vec();
21+
Some(response)
22+
}
23+
_ => None,
24+
};
25+
})
26+
.await
27+
.unwrap();
28+
});
29+
});
2730

2831
let url = "coap://127.0.0.1:5683/Rust";
2932
println!("Client request: {}", url);
3033

3134
let response = CoAPClient::get(url).unwrap();
32-
println!("Server reply: {}",
33-
String::from_utf8(response.message.payload).unwrap());
35+
println!(
36+
"Server reply: {}",
37+
String::from_utf8(response.message.payload).unwrap()
38+
);
3439
}

‎examples/server.rs‎

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,41 @@
22

33
extern crate coap;
44

5-
use coap_lite::{RequestType as Method};
65
use coap::Server;
6+
use coap_lite::RequestType as Method;
77
use tokio::runtime::Runtime;
88

99
fn main() {
1010
let addr = "127.0.0.1:5683";
1111

12-
Runtime::new().unwrap().block_on(async move {
13-
let mut server = Server::new(addr).unwrap();
14-
println!("Server up on {}", addr);
15-
16-
server.run(async move |request| {
17-
match request.get_method() {
18-
&Method::Get => println!("request by get {}", request.get_path()),
19-
&Method::Post => println!("request by post {}", String::from_utf8(request.message.payload).unwrap()),
20-
&Method::Put => println!("request by put {}", String::from_utf8(request.message.payload).unwrap()),
21-
_ => println!("request by other method"),
22-
};
23-
24-
return match request.response {
25-
Some(mut message) => {
26-
message.message.payload = b"OK".to_vec();
27-
Some(message)
28-
},
29-
_ => None
30-
};
31-
}).await.unwrap();
32-
});
12+
Runtime::new().unwrap().block_on(async move {
13+
let mut server = Server::new(addr).unwrap();
14+
println!("Server up on {}", addr);
15+
16+
server
17+
.run(async move |request| {
18+
match request.get_method() {
19+
&Method::Get => println!("request by get {}", request.get_path()),
20+
&Method::Post => println!(
21+
"request by post {}",
22+
String::from_utf8(request.message.payload).unwrap()
23+
),
24+
&Method::Put => println!(
25+
"request by put {}",
26+
String::from_utf8(request.message.payload).unwrap()
27+
),
28+
_ => println!("request by other method"),
29+
};
30+
31+
return match request.response {
32+
Some(mut message) => {
33+
message.message.payload = b"OK".to_vec();
34+
Some(message)
35+
}
36+
_ => None,
37+
};
38+
})
39+
.await
40+
.unwrap();
41+
});
3342
}

0 commit comments

Comments
 (0)