diff --git a/crates/clash-verge-draft/Cargo.toml b/crates/clash-verge-draft/Cargo.toml index fe5ed4d56..40351c26a 100644 --- a/crates/clash-verge-draft/Cargo.toml +++ b/crates/clash-verge-draft/Cargo.toml @@ -15,3 +15,6 @@ tokio = { workspace = true } [dev-dependencies] criterion = { workspace = true } + +[lints] +workspace = true diff --git a/crates/clash-verge-draft/bench/benche_me.rs b/crates/clash-verge-draft/bench/benche_me.rs index aedcdc606..6c1af9e49 100644 --- a/crates/clash-verge-draft/bench/benche_me.rs +++ b/crates/clash-verge-draft/bench/benche_me.rs @@ -19,6 +19,7 @@ fn make_draft() -> Draft { } pub fn bench_draft(c: &mut Criterion) { + #[allow(clippy::panic, reason = "bench setup cannot proceed without a runtime")] let rt = Runtime::new().unwrap_or_else(|e| panic!("Tokio runtime init failed: {e}")); let mut group = c.benchmark_group("draft"); diff --git a/crates/clash-verge-draft/src/lib.rs b/crates/clash-verge-draft/src/lib.rs index c9bf560e5..d1a968cb2 100644 --- a/crates/clash-verge-draft/src/lib.rs +++ b/crates/clash-verge-draft/src/lib.rs @@ -102,6 +102,7 @@ impl Draft { let (local, original_arc) = { let guard = self.inner.data.lock(); let arc = Arc::clone(&guard.0); + drop(guard); ((**arc).clone(), arc) }; let (new_local, res) = f(local).await?; @@ -112,6 +113,7 @@ impl Draft { )); } guard.0 = Arc::new(Box::new(new_local)); + drop(guard); Ok(res) } @@ -125,7 +127,10 @@ impl Draft { } #[inline] - async fn acquire_data_modify_permit(&self) -> DataModifyPermit<'_> { + async fn acquire_data_modify_permit(&self) -> DataModifyPermit<'_> + where + T: Send + Sync, + { for _ in 0..DATA_MODIFY_FAST_RETRY_YIELDS { if let Some(permit) = self.try_acquire_data_modify_permit() { return permit; diff --git a/crates/clash-verge-logging/Cargo.toml b/crates/clash-verge-logging/Cargo.toml index 3a9152857..c6d9feb20 100644 --- a/crates/clash-verge-logging/Cargo.toml +++ b/crates/clash-verge-logging/Cargo.toml @@ -15,3 +15,6 @@ default = [] tokio-trace = ["tracing-estuary/tokio-trace"] chrome-trace = ["tracing-estuary/chrome-trace"] color = ["tracing-estuary/color"] + +[lints] +workspace = true diff --git a/crates/clash-verge-logging/src/lib.rs b/crates/clash-verge-logging/src/lib.rs index edcdc1ace..ee8df5c53 100644 --- a/crates/clash-verge-logging/src/lib.rs +++ b/crates/clash-verge-logging/src/lib.rs @@ -160,7 +160,7 @@ pub struct Logger { static LOGGER: OnceLock = OnceLock::new(); impl Logger { - fn new() -> Self { + const fn new() -> Self { Self { pipeline: OnceLock::new(), sidecar_file_writer: RwLock::new(None), @@ -185,7 +185,7 @@ impl Logger { self.store_config(cfg); let pipeline = tracing_estuary::PipelineBuilder::new() .default_level(log_level) - .file_writer(self.generate_file_log_writer()?) + .file_writer(self.generate_file_log_writer()) .init()?; self.pipeline.set(pipeline).ok(); Ok(()) @@ -225,11 +225,11 @@ impl Logger { self.log_max_count.store(cfg.max_count, Ordering::SeqCst); } - fn generate_file_log_writer(&self) -> Result { + fn generate_file_log_writer(&self) -> FileLogWriterBuilder { let log_dir = self.log_dir.get().cloned().unwrap_or_default(); let log_max_size = self.log_max_size.load(Ordering::SeqCst); let log_max_count = self.log_max_count.load(Ordering::SeqCst); - let flwb = FileLogWriter::builder(FileSpec::default().directory(log_dir).basename("")) + FileLogWriter::builder(FileSpec::default().directory(log_dir).basename("")) .format(tracing_estuary::file_format_with_level) .write_mode(flexi_logger::WriteMode::BufferAndFlushWith( WRITE_BUFFER_CAPACITY, @@ -239,8 +239,7 @@ impl Logger { Criterion::Size(log_max_size * 1024), ROTATE_NAMING, Cleanup::KeepLogFiles(log_max_count), - ); - Ok(flwb) + ) } /// Ensures the sidecar writer exists and points at `builder`'s config: @@ -311,7 +310,7 @@ impl Logger { self.log_max_size.store(log_max_size, Ordering::SeqCst); self.log_max_count.store(log_max_count, Ordering::SeqCst); if let Some(pipeline) = self.pipeline.get() { - let log_file_writer = self.generate_file_log_writer()?; + let log_file_writer = self.generate_file_log_writer(); if let Some(sink) = pipeline.sink.as_ref() { sink.reset(log_file_writer) .map_err(|error| anyhow::anyhow!("failed to reset log writer: {error}"))?;