Skip to content

Commit 45d7ab0

Browse files
committed
feat: v0.2.7
1 parent d618d5f commit 45d7ab0

File tree

6 files changed

+28
-48
lines changed

6 files changed

+28
-48
lines changed

Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "udp-request"
3-
version = "0.2.6"
3+
version = "0.2.7"
44
edition = "2024"
55
authors = ["root@ltpp.vip"]
66
license = "MIT"
@@ -15,9 +15,6 @@ exclude = [
1515
".github"
1616
]
1717

18-
[dependencies]
19-
lombok-macros = "1.11.4"
20-
2118
[profile.dev]
2219
incremental = false
2320
opt-level = 3

src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ pub use response::*;
99

1010
pub(crate) use common::*;
1111

12-
pub(crate) use lombok_macros::*;
1312
pub(crate) use std::{
1413
error::Error as StdError,
1514
fmt::Debug,

src/request/config/struct.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use crate::*;
22

3-
#[derive(Debug, Clone, PartialEq, Eq, Data)]
3+
#[derive(Debug, Clone, PartialEq, Eq)]
44
pub struct Config {
5-
pub host: String,
6-
pub port: usize,
7-
pub timeout: u64,
8-
pub buffer_size: usize,
5+
pub(crate) host: String,
6+
pub(crate) port: usize,
7+
pub(crate) timeout: u64,
8+
pub(crate) buffer_size: usize,
99
}

src/request/request/impl.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl UdpRequest {
2323

2424
fn read_response(&mut self, socket: &mut UdpSocket) -> Result<BoxResponseTrait, RequestError> {
2525
let cfg_buffer_size: usize = self
26-
.get_config()
26+
.config
2727
.read()
2828
.map_or(DEFAULT_BUFFER_SIZE, |data| data.buffer_size);
2929
let mut tmp_buf: Vec<u8> = vec![0u8; cfg_buffer_size];
@@ -42,7 +42,7 @@ impl UdpRequest {
4242
fn get_connection_socket(&self, host: String, port: usize) -> Result<UdpSocket, RequestError> {
4343
let host_port: String = format!("{}:{}", host.clone(), port);
4444
let cfg_timeout: u64 = self
45-
.get_config()
45+
.config
4646
.read()
4747
.map_or(DEFAULT_TIMEOUT, |data| data.timeout);
4848
let timeout: Duration = Duration::from_millis(cfg_timeout);
@@ -67,11 +67,11 @@ impl RequestTrait for UdpRequest {
6767

6868
fn send(&mut self, data: &[u8]) -> Self::RequestResult {
6969
let cfg_timeout: Config = self
70-
.get_config()
70+
.config
7171
.read()
7272
.map_or(Config::default(), |data| data.clone());
73-
let host: String = cfg_timeout.get_host().clone();
74-
let port: usize = cfg_timeout.get_port().clone();
73+
let host: String = cfg_timeout.host.clone();
74+
let port: usize = cfg_timeout.port.clone();
7575
let mut socket: UdpSocket = self.get_connection_socket(host, port)?;
7676
let res: Result<BoxResponseTrait, RequestError> = self.send_request(&mut socket, data);
7777
res

src/request/request/struct.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::*;
22

3-
#[derive(Debug, Clone, Data)]
3+
#[derive(Debug, Clone)]
44
pub struct UdpRequest {
55
pub(crate) config: ArcRwLock<Config>,
66
pub(crate) response: ArcRwLock<UdpResponseBinary>,

src/request/request_builder/impl.rs

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,50 +18,34 @@ impl RequestBuilder {
1818
where
1919
T: Into<String>,
2020
{
21-
let _ = self
22-
.udp_request
23-
.get_mut_config()
24-
.write()
25-
.and_then(|mut data| {
26-
data.host = host.into();
27-
Ok(())
28-
});
21+
let _ = self.udp_request.config.write().and_then(|mut data| {
22+
data.host = host.into();
23+
Ok(())
24+
});
2925
self
3026
}
3127

3228
pub fn port(&mut self, port: usize) -> &mut Self {
33-
let _ = self
34-
.udp_request
35-
.get_mut_config()
36-
.write()
37-
.and_then(|mut data| {
38-
data.port = port;
39-
Ok(())
40-
});
29+
let _ = self.udp_request.config.write().and_then(|mut data| {
30+
data.port = port;
31+
Ok(())
32+
});
4133
self
4234
}
4335

4436
pub fn buffer(&mut self, buffer_size: usize) -> &mut Self {
45-
let _ = self
46-
.udp_request
47-
.get_mut_config()
48-
.write()
49-
.and_then(|mut data| {
50-
data.buffer_size = buffer_size;
51-
Ok(())
52-
});
37+
let _ = self.udp_request.config.write().and_then(|mut data| {
38+
data.buffer_size = buffer_size;
39+
Ok(())
40+
});
5341
self
5442
}
5543

5644
pub fn timeout(&mut self, timeout: u64) -> &mut Self {
57-
let _ = self
58-
.udp_request
59-
.get_mut_config()
60-
.write()
61-
.and_then(|mut data| {
62-
data.timeout = timeout;
63-
Ok(())
64-
});
45+
let _ = self.udp_request.config.write().and_then(|mut data| {
46+
data.timeout = timeout;
47+
Ok(())
48+
});
6549
self
6650
}
6751

0 commit comments

Comments
 (0)