Skip to content

Commit

Permalink
fix: some warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
ActivePeter committed Jun 30, 2024
1 parent bf73e72 commit bcaf1d2
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 19 deletions.
2 changes: 0 additions & 2 deletions src/general/m_appmeta_manager/fn_event.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
use crate::general::{
kv_interface::KvOps,
network::proto::sche::distribute_task_req::{Trigger, TriggerKvSet},
};

use super::{
super::network::proto::{self, kv::KvRequest},
AppMetas,
};

pub struct EventTriggerInfo {
Expand Down
3 changes: 1 addition & 2 deletions src/general/m_appmeta_manager/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ use crate::{
worker::func::m_instance_manager::InstanceManager,
};
use crate::{
result::{WSError, WsIoErr},
worker::m_executor::Executor,
};
use async_trait::async_trait;
Expand All @@ -44,7 +43,7 @@ use std::{
path::Path,
};
use tokio::sync::RwLock;
use uuid::Uuid;

use ws_derive::LogicalModule;

logical_module_view_impl!(View);
Expand Down
2 changes: 1 addition & 1 deletion src/general/m_data_general.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use crate::{
util::JoinHandleWrapper,
};
use crate::{
result::{WSError, WsDataError},
result::{WsDataError},
sys::LogicalModulesRef,
};
use async_trait::async_trait;
Expand Down
4 changes: 2 additions & 2 deletions src/general/m_os/zip.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
use super::OperatingSystem;
use crate::result::{ErrCvt, WSError, WSResult, WsIoErr};
use crate::result::{WSError, WSResult, WsIoErr};
use std::{
fs::{self, File},
io::{self, Cursor, Read, Seek, Write},
os::unix::fs::PermissionsExt,
path::Path,
};
use walkdir::WalkDir;
use zip::{result::ZipError, write::FileOptions, ZipWriter};
use zip::{result::ZipError, write::FileOptions};

impl OperatingSystem {
pub fn unzip_data_2_path(&self, p: impl AsRef<Path>, data: Vec<u8>) -> WSResult<()> {
Expand Down
2 changes: 1 addition & 1 deletion src/master/m_master_kv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use ws_derive::LogicalModule;
use crate::{
general::{
m_appmeta_manager::{
fn_event::{self, EventTriggerInfo},
fn_event::{EventTriggerInfo},
AppMetaManager,
},
m_kv_store_engine::{KeyTypeKv, KeyTypeKvPosition, KvStoreEngine},
Expand Down
2 changes: 1 addition & 1 deletion src/worker/func/shared/java.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::{fmt::format, str::from_utf8};
use std::{str::from_utf8};

use tokio::process::{self, Command};

Expand Down
4 changes: 1 addition & 3 deletions src/worker/func/shared/process.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// process function just run in unique process

use std::{
process::{self, Stdio},
sync::Arc,
};

Expand All @@ -12,10 +11,9 @@ use tokio::{process::Command, sync::oneshot};

use crate::{
general::{
m_appmeta_manager::{AppType, HttpMethod},
m_appmeta_manager::{AppType},
network::rpc_model::{self, HashValue},
},
result::WsFuncError,
worker::func::{shared::java, InstanceTrait},
};

Expand Down
1 change: 0 additions & 1 deletion src/worker/func/shared/process_instance_man_related.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use tokio::process::Command;
use crate::{
general::m_appmeta_manager::AppType,
result::{WSResult, WsFuncError},
util,
worker::func::{
m_instance_manager::{EachAppCache, InstanceManager},
shared::java,
Expand Down
6 changes: 3 additions & 3 deletions src/worker/m_data_follower.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::collections::HashSet;

use crate::general::m_data_general::{DataGeneral, DataSetMeta};
use crate::general::m_kv_store_engine::{KeyTypeDataSetMeta, KvStoreEngine};

use crate::general::m_data_general::{DataGeneral};
use crate::general::m_kv_store_engine::{KvStoreEngine};
use crate::general::network::m_p2p::{P2PModule, RPCHandler, RPCResponsor};
use crate::general::network::proto::{self, DataVersionRequest, DataVersionResponse};
use crate::result::{WSError, WSResult, WsDataError};
Expand Down
5 changes: 2 additions & 3 deletions src/worker/m_http_handler.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
use crate::{
general::network::http_handler::{start_http_handler, HttpHandler, LocalReqIdAllocator},
general::network::http_handler::{start_http_handler, HttpHandler},
logical_module_view_impl,
result::WSResult,
sys::{LogicalModule, LogicalModuleNewArgs, LogicalModulesRef},
util::{JoinHandleWrapper, WithBind},
};
use async_trait::async_trait;
use axum::{
http::StatusCode,
response::{IntoResponse, Response},
response::{Response},
Router,
};
use parking_lot::Mutex;
Expand Down

0 comments on commit bcaf1d2

Please sign in to comment.