From 7fb0851efd06589a71d1f1758eae03a7980ebf91 Mon Sep 17 00:00:00 2001 From: monosans Date: Wed, 13 Aug 2025 07:46:28 +0300 Subject: [PATCH] add crate::HashMap and crate::HashSet --- src/config.rs | 5 +++-- src/http.rs | 4 +--- src/main.rs | 3 +++ src/output.rs | 2 +- src/raw_config.rs | 3 +-- src/scraper.rs | 3 ++- src/tui.rs | 2 +- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/config.rs b/src/config.rs index 1b67ee3..b691b06 100644 --- a/src/config.rs +++ b/src/config.rs @@ -6,9 +6,10 @@ use std::{ }; use color_eyre::eyre::{OptionExt as _, WrapErr as _}; -use foldhash::HashMap; -use crate::{http::BasicAuth, proxy::ProxyType, raw_config, utils::is_docker}; +use crate::{ + HashMap, http::BasicAuth, proxy::ProxyType, raw_config, utils::is_docker, +}; pub const APP_DIRECTORY_NAME: &str = "proxy_scraper_checker"; diff --git a/src/http.rs b/src/http.rs index 414bd3f..0580448 100644 --- a/src/http.rs +++ b/src/http.rs @@ -5,9 +5,7 @@ use std::{ time::{Duration, SystemTime}, }; -use foldhash::HashMap; - -use crate::config::Config; +use crate::{HashMap, config::Config}; const DEFAULT_MAX_RETRIES: u32 = 2; const INITIAL_RETRY_DELAY: Duration = Duration::from_millis(500); diff --git a/src/main.rs b/src/main.rs index 9af5a4a..8ee651c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -80,6 +80,9 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc; type Error = color_eyre::Report; type Result = color_eyre::Result; +type HashMap = foldhash::HashMap; +type HashSet = foldhash::HashSet; + fn create_logging_filter( config: &config::Config, ) -> tracing_subscriber::filter::Targets { diff --git a/src/output.rs b/src/output.rs index f1797c1..aaf1f05 100644 --- a/src/output.rs +++ b/src/output.rs @@ -6,9 +6,9 @@ use std::{ }; use color_eyre::eyre::WrapErr as _; -use foldhash::HashMap; use crate::{ + HashMap, config::Config, ipdb, proxy::{Proxy, ProxyType}, diff --git a/src/raw_config.rs b/src/raw_config.rs index 8af8b54..557eaf8 100644 --- a/src/raw_config.rs +++ b/src/raw_config.rs @@ -5,10 +5,9 @@ use std::{ }; use color_eyre::eyre::WrapErr as _; -use foldhash::HashMap; use serde::Deserialize as _; -use crate::http::BasicAuth; +use crate::{HashMap, http::BasicAuth}; fn validate_positive_f64<'de, D: serde::Deserializer<'de>>( deserializer: D, diff --git a/src/scraper.rs b/src/scraper.rs index 608f1bb..5c0854a 100644 --- a/src/scraper.rs +++ b/src/scraper.rs @@ -1,11 +1,12 @@ use std::sync::Arc; use color_eyre::eyre::{OptionExt as _, WrapErr as _}; -use foldhash::{HashSet, HashSetExt as _}; +use foldhash::HashSetExt as _; #[cfg(feature = "tui")] use crate::event::{AppEvent, Event}; use crate::{ + HashSet, config::{Config, Source}, http, parsers::PROXY_REGEX, diff --git a/src/tui.rs b/src/tui.rs index d2d8ad1..b830fed 100644 --- a/src/tui.rs +++ b/src/tui.rs @@ -10,7 +10,6 @@ use color_eyre::eyre::WrapErr as _; use crossterm::event::{ Event as CrosstermEvent, KeyCode, KeyModifiers, MouseEventKind, }; -use foldhash::HashMap; use futures::StreamExt as _; use ratatui::{ Frame, @@ -22,6 +21,7 @@ use ratatui::{ use tui_logger::{TuiLoggerWidget, TuiWidgetEvent, TuiWidgetState}; use crate::{ + HashMap, event::{AppEvent, Event}, ipdb, proxy::ProxyType,