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)` --- .../turtle/src/atuin_server_database/calendar.rs | 8 +-- crates/turtle/src/atuin_server_database/mod.rs | 22 ++++---- crates/turtle/src/atuin_server_database/models.rs | 60 +++++++++++----------- 3 files changed, 45 insertions(+), 45 deletions(-) (limited to 'crates/turtle/src/atuin_server_database') diff --git a/crates/turtle/src/atuin_server_database/calendar.rs b/crates/turtle/src/atuin_server_database/calendar.rs index 2229667b..f1c78262 100644 --- a/crates/turtle/src/atuin_server_database/calendar.rs +++ b/crates/turtle/src/atuin_server_database/calendar.rs @@ -3,16 +3,16 @@ use serde::{Deserialize, Serialize}; use time::Month; -pub enum TimePeriod { +pub(crate) enum TimePeriod { Year, Month { year: i32 }, Day { year: i32, month: Month }, } #[derive(Debug, Serialize, Deserialize)] -pub struct TimePeriodInfo { - pub count: u64, +pub(crate) struct TimePeriodInfo { + pub(crate) count: u64, // TODO: Use this for merkle tree magic - pub hash: String, + pub(crate) hash: String, } diff --git a/crates/turtle/src/atuin_server_database/mod.rs b/crates/turtle/src/atuin_server_database/mod.rs index 91077b84..e4672bb0 100644 --- a/crates/turtle/src/atuin_server_database/mod.rs +++ b/crates/turtle/src/atuin_server_database/mod.rs @@ -1,5 +1,5 @@ -pub mod calendar; -pub mod models; +pub(crate) mod calendar; +pub(crate) mod models; use std::{ collections::HashMap, @@ -18,7 +18,7 @@ use time::{Date, Duration, Month, OffsetDateTime, PrimitiveDateTime, Time, UtcOf use tracing::instrument; #[derive(Debug)] -pub enum DbError { +pub(crate) enum DbError { NotFound, Other(eyre::Report), } @@ -52,24 +52,24 @@ impl From for DbError { impl std::error::Error for DbError {} -pub type DbResult = Result; +pub(crate) type DbResult = Result; #[derive(Debug, PartialEq)] -pub enum DbType { +pub(crate) enum DbType { Postgres, Sqlite, Unknown, } #[derive(Clone, Deserialize, Serialize)] -pub struct DbSettings { - pub db_uri: String, +pub(crate) struct DbSettings { + pub(crate) db_uri: String, /// Optional URI for read replicas. If set, read-only queries will use this connection. - pub read_db_uri: Option, + pub(crate) read_db_uri: Option, } impl DbSettings { - pub fn db_type(&self) -> DbType { + pub(crate) fn db_type(&self) -> DbType { if self.db_uri.starts_with("postgres://") || self.db_uri.starts_with("postgresql://") { DbType::Postgres } else if self.db_uri.starts_with("sqlite://") { @@ -109,7 +109,7 @@ impl Debug for DbSettings { } #[async_trait] -pub trait Database: Sized + Clone + Send + Sync + 'static { +pub(crate) trait Database: Sized + Clone + Send + Sync + 'static { async fn new(settings: &DbSettings) -> DbResult; async fn get_session(&self, token: &str) -> DbResult; @@ -238,7 +238,7 @@ pub trait Database: Sized + Clone + Send + Sync + 'static { } } -pub fn into_utc(x: OffsetDateTime) -> PrimitiveDateTime { +pub(crate) fn into_utc(x: OffsetDateTime) -> PrimitiveDateTime { let x = x.to_offset(UtcOffset::UTC); PrimitiveDateTime::new(x.date(), x.time()) } diff --git a/crates/turtle/src/atuin_server_database/models.rs b/crates/turtle/src/atuin_server_database/models.rs index b71a9bc9..e47d614d 100644 --- a/crates/turtle/src/atuin_server_database/models.rs +++ b/crates/turtle/src/atuin_server_database/models.rs @@ -1,52 +1,52 @@ use time::OffsetDateTime; -pub struct History { - pub id: i64, - pub client_id: String, // a client generated ID - pub user_id: i64, - pub hostname: String, - pub timestamp: OffsetDateTime, +pub(crate) struct History { + pub(crate) id: i64, + pub(crate) client_id: String, // a client generated ID + pub(crate) user_id: i64, + pub(crate) hostname: String, + pub(crate) timestamp: OffsetDateTime, /// All the data we have about this command, encrypted. /// /// Currently this is an encrypted msgpack object, but this may change in the future. - pub data: String, + pub(crate) data: String, - pub created_at: OffsetDateTime, + pub(crate) created_at: OffsetDateTime, } -pub struct NewHistory { - pub client_id: String, - pub user_id: i64, - pub hostname: String, - pub timestamp: OffsetDateTime, +pub(crate) struct NewHistory { + pub(crate) client_id: String, + pub(crate) user_id: i64, + pub(crate) hostname: String, + pub(crate) timestamp: OffsetDateTime, /// All the data we have about this command, encrypted. /// /// Currently this is an encrypted msgpack object, but this may change in the future. - pub data: String, + pub(crate) data: String, } -pub struct User { - pub id: i64, - pub username: String, - pub email: String, - pub password: String, +pub(crate) struct User { + pub(crate) id: i64, + pub(crate) username: String, + pub(crate) email: String, + pub(crate) password: String, } -pub struct Session { - pub id: i64, - pub user_id: i64, - pub token: String, +pub(crate) struct Session { + pub(crate) id: i64, + pub(crate) user_id: i64, + pub(crate) token: String, } -pub struct NewUser { - pub username: String, - pub email: String, - pub password: String, +pub(crate) struct NewUser { + pub(crate) username: String, + pub(crate) email: String, + pub(crate) password: String, } -pub struct NewSession { - pub user_id: i64, - pub token: String, +pub(crate) struct NewSession { + pub(crate) user_id: i64, + pub(crate) token: String, } -- cgit v1.3.1