Skip to content

Commit 9258ac0

Browse files
committed
feat:type
1 parent 7fd3dd4 commit 9258ac0

File tree

9 files changed

+28
-18
lines changed

9 files changed

+28
-18
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "hyperlane"
3-
version = "2.12.0"
3+
version = "2.13.0"
44
edition = "2021"
55
authors = ["ltpp-universe <root@ltpp.vip>"]
66
license = "MIT"

src/server/impl.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
use super::{
2-
config::r#type::ServerConfig, controller_data::r#type::ControllerData, error::r#type::Error,
3-
middleware::r#type::MiddlewareArcLock, r#type::Server, route::r#type::RouterFuncArcLock,
4-
thread_pool::r#type::ThreadPool, tmp::r#type::Tmp,
2+
config::r#type::ServerConfig,
3+
controller_data::r#type::ControllerData,
4+
error::r#type::Error,
5+
middleware::r#type::MiddlewareArcLock,
6+
r#type::Server,
7+
route::r#type::{RouterFuncArcLock, VecRouterFuncBox},
8+
thread_pool::r#type::ThreadPool,
9+
tmp::r#type::Tmp,
510
};
611
use http_type::*;
712
use hyperlane_log::*;
@@ -13,7 +18,7 @@ impl Default for Server {
1318
Self {
1419
cfg: Arc::new(RwLock::new(ServerConfig::default())),
1520
router_func: Arc::new(RwLock::new(HashMap::new())),
16-
middleware: Arc::new(RwLock::new(vec![])),
21+
middleware: Arc::new(RwLock::new(VecRouterFuncBox::default())),
1722
tmp: Arc::new(RwLock::new(Tmp::default())),
1823
}
1924
}

src/server/middleware/type.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
use crate::server::controller_data::r#type::ControllerData;
2-
use http_type::ArcRwLock;
1+
use crate::server::{controller_data::r#type::ControllerData, route::r#type::VecRouterFuncBox};
2+
use http_type::*;
33

4+
pub type ArcRwLockHashMapMiddlewareFuncBox = ArcRwLock<VecRouterFuncBox>;
45
pub type MiddlewareArcLock = ArcRwLock<Vec<Box<dyn Fn(&mut ControllerData) + Send + Sync>>>;

src/server/route/type.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
use crate::server::controller_data::r#type::ControllerData;
2-
use http_type::ArcRwLock;
2+
use http_type::*;
33
use std::collections::HashMap;
44

55
pub type RouterFunc = dyn Fn(&mut ControllerData) + Send + Sync + 'static;
66
pub type RouterFuncBox = Box<RouterFunc>;
7+
pub type VecRouterFuncBox = Vec<RouterFuncBox>;
8+
pub type ArcRwLockHashMapRouterFuncBox = ArcRwLock<HashMap<&'static str, RouterFuncBox>>;
79
pub type RouterFuncArcLock =
810
ArcRwLock<HashMap<&'static str, Box<dyn Fn(&mut ControllerData) + Send + Sync>>>;

src/server/thread_pool/impl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::r#type::ThreadPool;
22
use crate::server::worker::r#type::Worker;
3-
use http_type::ArcMutex;
3+
use http_type::*;
44
use std::sync::mpsc::{self, Receiver};
55
pub use std_macro_extensions::*;
66

src/server/tmp/type.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use http_type::ArcMutex;
1+
use http_type::*;
22
use hyperlane_log::*;
33
use lombok_macros::*;
44

src/server/type.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
use super::{config::r#type::ServerConfig, route::r#type::RouterFuncBox, tmp::r#type::Tmp};
2-
use http_type::ArcRwLock;
3-
use lombok_macros::Lombok;
4-
use std::collections::HashMap;
1+
use super::{
2+
config::r#type::ServerConfig, middleware::r#type::ArcRwLockHashMapMiddlewareFuncBox,
3+
route::r#type::ArcRwLockHashMapRouterFuncBox, tmp::r#type::Tmp,
4+
};
5+
use http_type::*;
6+
use lombok_macros::*;
57

68
#[derive(Clone, Lombok)]
79
pub struct Server {
810
pub(crate) cfg: ArcRwLock<ServerConfig<'static>>,
9-
pub(crate) router_func: ArcRwLock<HashMap<&'static str, RouterFuncBox>>,
10-
pub(crate) middleware: ArcRwLock<Vec<RouterFuncBox>>,
11+
pub(crate) router_func: ArcRwLockHashMapRouterFuncBox,
12+
pub(crate) middleware: ArcRwLockHashMapMiddlewareFuncBox,
1113
pub(crate) tmp: ArcRwLock<Tmp>,
1214
}

src/server/worker/type.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use lombok_macros::Lombok;
1+
use lombok_macros::*;
22
use std::thread::JoinHandle;
33

44
#[allow(dead_code)]

0 commit comments

Comments
 (0)