From 199563550dd41c3dfb703bd3747604a8a03cdbc5 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Thu, 11 Jun 2026 14:20:49 +0200 Subject: chore: Remove all `pub`s They will not be marked by rustc/cargo as unused, and as atuin doesn't expose an API all of them _should_ be `pub(crate)` --- crates/turtle/src/atuin_client/import/bash.rs | 2 +- crates/turtle/src/atuin_client/import/fish.rs | 2 +- crates/turtle/src/atuin_client/import/mod.rs | 30 +++--- crates/turtle/src/atuin_client/import/nu.rs | 2 +- crates/turtle/src/atuin_client/import/nu_histdb.rs | 24 ++--- .../turtle/src/atuin_client/import/powershell.rs | 2 +- crates/turtle/src/atuin_client/import/replxx.rs | 2 +- crates/turtle/src/atuin_client/import/resh.rs | 106 ++++++++++----------- crates/turtle/src/atuin_client/import/xonsh.rs | 2 +- .../turtle/src/atuin_client/import/xonsh_sqlite.rs | 2 +- crates/turtle/src/atuin_client/import/zsh.rs | 2 +- .../turtle/src/atuin_client/import/zsh_histdb.rs | 28 +++--- 12 files changed, 102 insertions(+), 102 deletions(-) (limited to 'crates/turtle/src/atuin_client/import') diff --git a/crates/turtle/src/atuin_client/import/bash.rs b/crates/turtle/src/atuin_client/import/bash.rs index d92fdfa0..e35634e7 100644 --- a/crates/turtle/src/atuin_client/import/bash.rs +++ b/crates/turtle/src/atuin_client/import/bash.rs @@ -12,7 +12,7 @@ use crate::atuin_client::history::History; use crate::atuin_client::import::read_to_end; #[derive(Debug)] -pub struct Bash { +pub(crate) struct Bash { bytes: Vec, } diff --git a/crates/turtle/src/atuin_client/import/fish.rs b/crates/turtle/src/atuin_client/import/fish.rs index 1375bdd6..edc2d437 100644 --- a/crates/turtle/src/atuin_client/import/fish.rs +++ b/crates/turtle/src/atuin_client/import/fish.rs @@ -13,7 +13,7 @@ use crate::atuin_client::history::History; use crate::atuin_client::import::read_to_end; #[derive(Debug)] -pub struct Fish { +pub(crate) struct Fish { bytes: Vec, } diff --git a/crates/turtle/src/atuin_client/import/mod.rs b/crates/turtle/src/atuin_client/import/mod.rs index 7726ead7..81e01991 100644 --- a/crates/turtle/src/atuin_client/import/mod.rs +++ b/crates/turtle/src/atuin_client/import/mod.rs @@ -8,20 +8,20 @@ use memchr::Memchr; use crate::atuin_client::history::History; -pub mod bash; -pub mod fish; -pub mod nu; -pub mod nu_histdb; -pub mod powershell; -pub mod replxx; -pub mod resh; -pub mod xonsh; -pub mod xonsh_sqlite; -pub mod zsh; -pub mod zsh_histdb; +pub(crate) mod bash; +pub(crate) mod fish; +pub(crate) mod nu; +pub(crate) mod nu_histdb; +pub(crate) mod powershell; +pub(crate) mod replxx; +pub(crate) mod resh; +pub(crate) mod xonsh; +pub(crate) mod xonsh_sqlite; +pub(crate) mod zsh; +pub(crate) mod zsh_histdb; #[async_trait] -pub trait Importer: Sized { +pub(crate) trait Importer: Sized { const NAME: &'static str; async fn new() -> Result; async fn entries(&mut self) -> Result; @@ -29,7 +29,7 @@ pub trait Importer: Sized { } #[async_trait] -pub trait Loader: Sync + Send { +pub(crate) trait Loader: Sync + Send { async fn push(&mut self, hist: History) -> eyre::Result<()>; } @@ -126,8 +126,8 @@ mod tests { use super::*; #[derive(Default)] - pub struct TestLoader { - pub buf: Vec, + pub(crate) struct TestLoader { + pub(crate) buf: Vec, } #[async_trait] diff --git a/crates/turtle/src/atuin_client/import/nu.rs b/crates/turtle/src/atuin_client/import/nu.rs index c93789b8..1897a969 100644 --- a/crates/turtle/src/atuin_client/import/nu.rs +++ b/crates/turtle/src/atuin_client/import/nu.rs @@ -13,7 +13,7 @@ use crate::atuin_client::history::History; use crate::atuin_client::import::read_to_end; #[derive(Debug)] -pub struct Nu { +pub(crate) struct Nu { bytes: Vec, } diff --git a/crates/turtle/src/atuin_client/import/nu_histdb.rs b/crates/turtle/src/atuin_client/import/nu_histdb.rs index 7de18369..1f66ea38 100644 --- a/crates/turtle/src/atuin_client/import/nu_histdb.rs +++ b/crates/turtle/src/atuin_client/import/nu_histdb.rs @@ -14,16 +14,16 @@ use crate::atuin_client::history::History; use crate::atuin_client::import::Loader; #[derive(sqlx::FromRow, Debug)] -pub struct HistDbEntry { - pub id: i64, - pub command_line: Vec, - pub start_timestamp: i64, - pub session_id: i64, - pub hostname: Vec, - pub cwd: Vec, - pub duration_ms: i64, - pub exit_status: i64, - pub more_info: Vec, +pub(crate) struct HistDbEntry { + pub(crate) id: i64, + pub(crate) command_line: Vec, + pub(crate) start_timestamp: i64, + pub(crate) session_id: i64, + pub(crate) hostname: Vec, + pub(crate) cwd: Vec, + pub(crate) duration_ms: i64, + pub(crate) exit_status: i64, + pub(crate) more_info: Vec, } impl From for History { @@ -47,7 +47,7 @@ impl From for History { } #[derive(Debug)] -pub struct NuHistDb { +pub(crate) struct NuHistDb { histdb: Vec, } @@ -72,7 +72,7 @@ async fn hist_from_db_conn(pool: Pool) -> Result> } impl NuHistDb { - pub fn histpath() -> Result { + pub(crate) fn histpath() -> Result { let base = BaseDirs::new().ok_or_else(|| eyre!("could not determine data directory"))?; let config_dir = base.config_dir().join("nushell"); diff --git a/crates/turtle/src/atuin_client/import/powershell.rs b/crates/turtle/src/atuin_client/import/powershell.rs index 8adcc850..09da0825 100644 --- a/crates/turtle/src/atuin_client/import/powershell.rs +++ b/crates/turtle/src/atuin_client/import/powershell.rs @@ -9,7 +9,7 @@ use crate::atuin_client::history::History; use crate::atuin_client::import::read_to_end; #[derive(Debug)] -pub struct PowerShell { +pub(crate) struct PowerShell { bytes: Vec, line_count: Option, } diff --git a/crates/turtle/src/atuin_client/import/replxx.rs b/crates/turtle/src/atuin_client/import/replxx.rs index 42f84df5..fbce2598 100644 --- a/crates/turtle/src/atuin_client/import/replxx.rs +++ b/crates/turtle/src/atuin_client/import/replxx.rs @@ -10,7 +10,7 @@ use crate::atuin_client::history::History; use crate::atuin_client::import::read_to_end; #[derive(Debug)] -pub struct Replxx { +pub(crate) struct Replxx { bytes: Vec, } diff --git a/crates/turtle/src/atuin_client/import/resh.rs b/crates/turtle/src/atuin_client/import/resh.rs index c5980c44..2c75e387 100644 --- a/crates/turtle/src/atuin_client/import/resh.rs +++ b/crates/turtle/src/atuin_client/import/resh.rs @@ -14,62 +14,62 @@ use crate::atuin_client::import::read_to_end; #[derive(Deserialize, Debug)] #[serde(rename_all = "camelCase")] -pub struct ReshEntry { - pub cmd_line: String, - pub exit_code: i64, - pub shell: String, - pub uname: String, - pub session_id: String, - pub home: String, - pub lang: String, - pub lc_all: String, - pub login: String, - pub pwd: String, - pub pwd_after: String, - pub shell_env: String, - pub term: String, - pub real_pwd: String, - pub real_pwd_after: String, - pub pid: i64, - pub session_pid: i64, - pub host: String, - pub hosttype: String, - pub ostype: String, - pub machtype: String, - pub shlvl: i64, - pub timezone_before: String, - pub timezone_after: String, - pub realtime_before: f64, - pub realtime_after: f64, - pub realtime_before_local: f64, - pub realtime_after_local: f64, - pub realtime_duration: f64, - pub realtime_since_session_start: f64, - pub realtime_since_boot: f64, - pub git_dir: String, - pub git_real_dir: String, - pub git_origin_remote: String, - pub git_dir_after: String, - pub git_real_dir_after: String, - pub git_origin_remote_after: String, - pub machine_id: String, - pub os_release_id: String, - pub os_release_version_id: String, - pub os_release_id_like: String, - pub os_release_name: String, - pub os_release_pretty_name: String, - pub resh_uuid: String, - pub resh_version: String, - pub resh_revision: String, - pub parts_merged: bool, - pub recalled: bool, - pub recall_last_cmd_line: String, - pub cols: String, - pub lines: String, +pub(crate) struct ReshEntry { + pub(crate) cmd_line: String, + pub(crate) exit_code: i64, + pub(crate) shell: String, + pub(crate) uname: String, + pub(crate) session_id: String, + pub(crate) home: String, + pub(crate) lang: String, + pub(crate) lc_all: String, + pub(crate) login: String, + pub(crate) pwd: String, + pub(crate) pwd_after: String, + pub(crate) shell_env: String, + pub(crate) term: String, + pub(crate) real_pwd: String, + pub(crate) real_pwd_after: String, + pub(crate) pid: i64, + pub(crate) session_pid: i64, + pub(crate) host: String, + pub(crate) hosttype: String, + pub(crate) ostype: String, + pub(crate) machtype: String, + pub(crate) shlvl: i64, + pub(crate) timezone_before: String, + pub(crate) timezone_after: String, + pub(crate) realtime_before: f64, + pub(crate) realtime_after: f64, + pub(crate) realtime_before_local: f64, + pub(crate) realtime_after_local: f64, + pub(crate) realtime_duration: f64, + pub(crate) realtime_since_session_start: f64, + pub(crate) realtime_since_boot: f64, + pub(crate) git_dir: String, + pub(crate) git_real_dir: String, + pub(crate) git_origin_remote: String, + pub(crate) git_dir_after: String, + pub(crate) git_real_dir_after: String, + pub(crate) git_origin_remote_after: String, + pub(crate) machine_id: String, + pub(crate) os_release_id: String, + pub(crate) os_release_version_id: String, + pub(crate) os_release_id_like: String, + pub(crate) os_release_name: String, + pub(crate) os_release_pretty_name: String, + pub(crate) resh_uuid: String, + pub(crate) resh_version: String, + pub(crate) resh_revision: String, + pub(crate) parts_merged: bool, + pub(crate) recalled: bool, + pub(crate) recall_last_cmd_line: String, + pub(crate) cols: String, + pub(crate) lines: String, } #[derive(Debug)] -pub struct Resh { +pub(crate) struct Resh { bytes: Vec, } diff --git a/crates/turtle/src/atuin_client/import/xonsh.rs b/crates/turtle/src/atuin_client/import/xonsh.rs index a7217826..5df24284 100644 --- a/crates/turtle/src/atuin_client/import/xonsh.rs +++ b/crates/turtle/src/atuin_client/import/xonsh.rs @@ -36,7 +36,7 @@ struct HistoryCmd { } #[derive(Debug)] -pub struct Xonsh { +pub(crate) struct Xonsh { // history is stored as a bunch of json files, one per session sessions: Vec, hostname: String, diff --git a/crates/turtle/src/atuin_client/import/xonsh_sqlite.rs b/crates/turtle/src/atuin_client/import/xonsh_sqlite.rs index ceedf7e9..326fe74b 100644 --- a/crates/turtle/src/atuin_client/import/xonsh_sqlite.rs +++ b/crates/turtle/src/atuin_client/import/xonsh_sqlite.rs @@ -81,7 +81,7 @@ fn xonsh_db_path(xonsh_data_dir: Option) -> Result { } #[derive(Debug)] -pub struct XonshSqlite { +pub(crate) struct XonshSqlite { pool: SqlitePool, hostname: String, } diff --git a/crates/turtle/src/atuin_client/import/zsh.rs b/crates/turtle/src/atuin_client/import/zsh.rs index e1fd813a..55d082d3 100644 --- a/crates/turtle/src/atuin_client/import/zsh.rs +++ b/crates/turtle/src/atuin_client/import/zsh.rs @@ -14,7 +14,7 @@ use crate::atuin_client::history::History; use crate::atuin_client::import::read_to_end; #[derive(Debug)] -pub struct Zsh { +pub(crate) struct Zsh { bytes: Vec, } diff --git a/crates/turtle/src/atuin_client/import/zsh_histdb.rs b/crates/turtle/src/atuin_client/import/zsh_histdb.rs index f61bb74f..46622e32 100644 --- a/crates/turtle/src/atuin_client/import/zsh_histdb.rs +++ b/crates/turtle/src/atuin_client/import/zsh_histdb.rs @@ -48,24 +48,24 @@ use crate::atuin_client::import::Loader; use crate::atuin_client::utils::{get_hostname, get_username}; #[derive(sqlx::FromRow, Debug)] -pub struct HistDbEntryCount { - pub count: usize, +pub(crate) struct HistDbEntryCount { + pub(crate) count: usize, } #[derive(sqlx::FromRow, Debug)] -pub struct HistDbEntry { - pub id: i64, - pub start_time: PrimitiveDateTime, - pub host: Vec, - pub dir: Vec, - pub argv: Vec, - pub duration: i64, - pub exit_status: i64, - pub session: i64, +pub(crate) struct HistDbEntry { + pub(crate) id: i64, + pub(crate) start_time: PrimitiveDateTime, + pub(crate) host: Vec, + pub(crate) dir: Vec, + pub(crate) argv: Vec, + pub(crate) duration: i64, + pub(crate) exit_status: i64, + pub(crate) session: i64, } #[derive(Debug)] -pub struct ZshHistDb { +pub(crate) struct ZshHistDb { histdb: Vec, username: String, } @@ -93,7 +93,7 @@ async fn hist_from_db_conn(pool: Pool) -> Result> } impl ZshHistDb { - pub fn histpath_candidate() -> PathBuf { + pub(crate) fn histpath_candidate() -> PathBuf { // By default histdb database is `${HOME}/.histdb/zsh-history.db` // This can be modified by ${HISTDB_FILE} // @@ -106,7 +106,7 @@ impl ZshHistDb { .map(|x| Path::new(x).to_path_buf()) .unwrap_or_else(|_err| home_dir.join(".histdb/zsh-history.db")) } - pub fn histpath() -> Result { + pub(crate) fn histpath() -> Result { let histdb_path = ZshHistDb::histpath_candidate(); if histdb_path.exists() { Ok(histdb_path) -- cgit v1.3.1