diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2026-06-11 00:54:30 +0200 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2026-06-11 00:54:30 +0200 |
| commit | 5c39e7cf284a1f6e9a1657f2deb44e359fc47eb8 (patch) | |
| tree | c64baa8d5866c8e339eaf660dd3f94f30a3f7d8a /crates/atuin-common | |
| parent | chore: Somewhat simplify sync code (diff) | |
| download | atuin-5c39e7cf284a1f6e9a1657f2deb44e359fc47eb8.zip | |
chore: Move everything into one big crate
That helps remove duplicated code and rustc/cargo will now also show
dead code correctly.
Diffstat (limited to '')
| -rw-r--r-- | crates/atuin-common/Cargo.toml | 31 | ||||
| -rw-r--r-- | crates/turtle/src/atuin_common/api.rs (renamed from crates/atuin-common/src/api.rs) | 0 | ||||
| -rw-r--r-- | crates/turtle/src/atuin_common/calendar.rs (renamed from crates/atuin-common/src/calendar.rs) | 0 | ||||
| -rw-r--r-- | crates/turtle/src/atuin_common/mod.rs (renamed from crates/atuin-common/src/lib.rs) | 2 | ||||
| -rw-r--r-- | crates/turtle/src/atuin_common/record.rs (renamed from crates/atuin-common/src/record.rs) | 8 | ||||
| -rw-r--r-- | crates/turtle/src/atuin_common/shell.rs (renamed from crates/atuin-common/src/shell.rs) | 0 | ||||
| -rw-r--r-- | crates/turtle/src/atuin_common/tls.rs (renamed from crates/atuin-common/src/tls.rs) | 0 | ||||
| -rw-r--r-- | crates/turtle/src/atuin_common/utils.rs (renamed from crates/atuin-common/src/utils.rs) | 0 |
8 files changed, 4 insertions, 37 deletions
diff --git a/crates/atuin-common/Cargo.toml b/crates/atuin-common/Cargo.toml deleted file mode 100644 index 811b0bdb..00000000 --- a/crates/atuin-common/Cargo.toml +++ /dev/null @@ -1,31 +0,0 @@ -[package] -name = "atuin-common" -edition = "2024" -description = "common library for atuin" - -rust-version = { workspace = true } -version = { workspace = true } -authors = { workspace = true } -license = { workspace = true } -homepage = { workspace = true } -repository = { workspace = true } - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -time = { workspace = true } -serde = { workspace = true } -uuid = { workspace = true } -typed-builder = { workspace = true } -eyre = { workspace = true } -sqlx = { workspace = true } -semver = { workspace = true } -thiserror = { workspace = true } -directories = { workspace = true } -sysinfo = "0.30.7" -base64 = { workspace = true } -getrandom = "0.2" -rustls = { workspace = true } - -[dev-dependencies] -pretty_assertions = { workspace = true } diff --git a/crates/atuin-common/src/api.rs b/crates/turtle/src/atuin_common/api.rs index 1a9f348c..1a9f348c 100644 --- a/crates/atuin-common/src/api.rs +++ b/crates/turtle/src/atuin_common/api.rs diff --git a/crates/atuin-common/src/calendar.rs b/crates/turtle/src/atuin_common/calendar.rs index d3b1d921..d3b1d921 100644 --- a/crates/atuin-common/src/calendar.rs +++ b/crates/turtle/src/atuin_common/calendar.rs diff --git a/crates/atuin-common/src/lib.rs b/crates/turtle/src/atuin_common/mod.rs index 91164a82..d886520d 100644 --- a/crates/atuin-common/src/lib.rs +++ b/crates/turtle/src/atuin_common/mod.rs @@ -1,5 +1,3 @@ -#![deny(unsafe_code)] - /// Defines a new UUID type wrapper macro_rules! new_uuid { ($name:ident) => { diff --git a/crates/atuin-common/src/record.rs b/crates/turtle/src/atuin_common/record.rs index e6ce2647..05c29338 100644 --- a/crates/atuin-common/src/record.rs +++ b/crates/turtle/src/atuin_common/record.rs @@ -46,7 +46,7 @@ pub type RecordIdx = u64; #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, TypedBuilder)] pub struct Record<Data> { /// a unique ID - #[builder(default = RecordId(crate::utils::uuid_v7()))] + #[builder(default = RecordId(crate::atuin_common::utils::uuid_v7()))] pub id: RecordId, /// The integer record ID. This is only unique per (host, tag). @@ -280,16 +280,16 @@ impl Record<EncryptedData> { #[cfg(test)] mod tests { - use crate::record::{Host, HostId}; + use crate::atuin_common::record::{Host, HostId}; use super::{DecryptedData, Diff, Record, RecordStatus}; use pretty_assertions::assert_eq; fn test_record() -> Record<DecryptedData> { Record::builder() - .host(Host::new(HostId(crate::utils::uuid_v7()))) + .host(Host::new(HostId(crate::atuin_common::utils::uuid_v7()))) .version("v1".into()) - .tag(crate::utils::uuid_v7().simple().to_string()) + .tag(crate::atuin_common::utils::uuid_v7().simple().to_string()) .data(DecryptedData(vec![0, 1, 2, 3])) .idx(0) .build() diff --git a/crates/atuin-common/src/shell.rs b/crates/turtle/src/atuin_common/shell.rs index 7f9a7b8f..7f9a7b8f 100644 --- a/crates/atuin-common/src/shell.rs +++ b/crates/turtle/src/atuin_common/shell.rs diff --git a/crates/atuin-common/src/tls.rs b/crates/turtle/src/atuin_common/tls.rs index e8c840e0..e8c840e0 100644 --- a/crates/atuin-common/src/tls.rs +++ b/crates/turtle/src/atuin_common/tls.rs diff --git a/crates/atuin-common/src/utils.rs b/crates/turtle/src/atuin_common/utils.rs index d7382fb2..d7382fb2 100644 --- a/crates/atuin-common/src/utils.rs +++ b/crates/turtle/src/atuin_common/utils.rs |
