aboutsummaryrefslogtreecommitdiffstats
path: root/crates
diff options
context:
space:
mode:
authorRay Kohler <ataraxia937@ataraxia937.xyz>2025-08-11 18:03:40 -0400
committerEllie Huxtable <ellie@elliehuxtable.com>2025-09-10 12:57:43 -0700
commit3b8702790b6c74786cdd0cc04c2d89962c1117cb (patch)
treec1a779a46445fd9ca7c295a75cbf63ce965d7a7c /crates
parentfix: `cargo update` and changes needed to accomodate it (diff)
downloadatuin-3b8702790b6c74786cdd0cc04c2d89962c1117cb.zip
fix: run `cargo fmt`
Diffstat (limited to 'crates')
-rw-r--r--crates/atuin-client/src/api_client.rs7
-rw-r--r--crates/atuin-client/src/database.rs7
-rw-r--r--crates/atuin-client/src/import/xonsh.rs10
-rw-r--r--crates/atuin-client/src/record/sqlite_store.rs7
-rw-r--r--crates/atuin-kv/src/database.rs7
-rw-r--r--crates/atuin-scripts/src/database.rs7
-rw-r--r--crates/atuin-server/src/handlers/record.rs4
-rw-r--r--crates/atuin/src/command/client/search/interactive.rs9
-rw-r--r--crates/atuin/src/command/client/store/pull.rs7
-rw-r--r--crates/atuin/src/command/client/store/push.rs7
10 files changed, 37 insertions, 35 deletions
diff --git a/crates/atuin-client/src/api_client.rs b/crates/atuin-client/src/api_client.rs
index 73eb0e75..2ab595d4 100644
--- a/crates/atuin-client/src/api_client.rs
+++ b/crates/atuin-client/src/api_client.rs
@@ -346,12 +346,7 @@ impl<'a> Client<'a> {
start: RecordIdx,
count: u64,
) -> Result<Vec<Record<EncryptedData>>> {
- debug!(
- "fetching record/s from host {}/{}/{}",
- host.0,
- tag,
- start
- );
+ debug!("fetching record/s from host {}/{}/{}", host.0, tag, start);
let url = make_url(
self.sync_addr,
diff --git a/crates/atuin-client/src/database.rs b/crates/atuin-client/src/database.rs
index 15f4fff1..472038f2 100644
--- a/crates/atuin-client/src/database.rs
+++ b/crates/atuin-client/src/database.rs
@@ -143,9 +143,10 @@ impl Sqlite {
}
if !path.exists()
- && let Some(dir) = path.parent() {
- fs::create_dir_all(dir)?;
- }
+ && let Some(dir) = path.parent()
+ {
+ fs::create_dir_all(dir)?;
+ }
let opts = SqliteConnectOptions::from_str(path.as_os_str().to_str().unwrap())?
.journal_mode(SqliteJournalMode::Wal)
diff --git a/crates/atuin-client/src/import/xonsh.rs b/crates/atuin-client/src/import/xonsh.rs
index a9e6449d..6f38de68 100644
--- a/crates/atuin-client/src/import/xonsh.rs
+++ b/crates/atuin-client/src/import/xonsh.rs
@@ -66,10 +66,12 @@ fn load_sessions(hist_dir: &Path) -> Result<Vec<HistoryData>> {
for entry in fs::read_dir(hist_dir)? {
let p = entry?.path();
let ext = p.extension().and_then(|e| e.to_str());
- if p.is_file() && ext == Some("json")
- && let Some(data) = load_session(&p)? {
- sessions.push(data);
- }
+ if p.is_file()
+ && ext == Some("json")
+ && let Some(data) = load_session(&p)?
+ {
+ sessions.push(data);
+ }
}
Ok(sessions)
}
diff --git a/crates/atuin-client/src/record/sqlite_store.rs b/crates/atuin-client/src/record/sqlite_store.rs
index 03b5e448..e5f5f4e6 100644
--- a/crates/atuin-client/src/record/sqlite_store.rs
+++ b/crates/atuin-client/src/record/sqlite_store.rs
@@ -42,9 +42,10 @@ impl SqliteStore {
}
if !path.exists()
- && let Some(dir) = path.parent() {
- fs::create_dir_all(dir)?;
- }
+ && let Some(dir) = path.parent()
+ {
+ fs::create_dir_all(dir)?;
+ }
let opts = SqliteConnectOptions::from_str(path.as_os_str().to_str().unwrap())?
.journal_mode(SqliteJournalMode::Wal)
diff --git a/crates/atuin-kv/src/database.rs b/crates/atuin-kv/src/database.rs
index b0aa4bd2..446aa7af 100644
--- a/crates/atuin-kv/src/database.rs
+++ b/crates/atuin-kv/src/database.rs
@@ -31,9 +31,10 @@ impl Database {
}
if !path.exists()
- && let Some(dir) = path.parent() {
- fs::create_dir_all(dir).await?;
- }
+ && let Some(dir) = path.parent()
+ {
+ fs::create_dir_all(dir).await?;
+ }
let opts = SqliteConnectOptions::from_str(path.as_os_str().to_str().unwrap())?
.journal_mode(SqliteJournalMode::Wal)
diff --git a/crates/atuin-scripts/src/database.rs b/crates/atuin-scripts/src/database.rs
index 4833f6ee..26fb9328 100644
--- a/crates/atuin-scripts/src/database.rs
+++ b/crates/atuin-scripts/src/database.rs
@@ -32,9 +32,10 @@ impl Database {
}
if !path.exists()
- && let Some(dir) = path.parent() {
- fs::create_dir_all(dir).await?;
- }
+ && let Some(dir) = path.parent()
+ {
+ fs::create_dir_all(dir).await?;
+ }
let opts = SqliteConnectOptions::from_str(path.as_os_str().to_str().unwrap())?
.journal_mode(SqliteJournalMode::Wal)
diff --git a/crates/atuin-server/src/handlers/record.rs b/crates/atuin-server/src/handlers/record.rs
index 59a10109..410c54bd 100644
--- a/crates/atuin-server/src/handlers/record.rs
+++ b/crates/atuin-server/src/handlers/record.rs
@@ -8,9 +8,7 @@ use crate::router::UserAuth;
use atuin_common::record::{EncryptedData, Record};
#[instrument(skip_all, fields(user.id = user.id))]
-pub async fn post(
- UserAuth(user): UserAuth,
-) -> Result<(), ErrorResponseStatus<'static>> {
+pub async fn post(UserAuth(user): UserAuth) -> Result<(), ErrorResponseStatus<'static>> {
// anyone who has actually used the old record store (a very small number) will see this error
// upon trying to sync.
// 1. The status endpoint will say that the server has nothing
diff --git a/crates/atuin/src/command/client/search/interactive.rs b/crates/atuin/src/command/client/search/interactive.rs
index 57ddaca9..66497ab7 100644
--- a/crates/atuin/src/command/client/search/interactive.rs
+++ b/crates/atuin/src/command/client/search/interactive.rs
@@ -170,10 +170,11 @@ impl State {
.or_else(|| self.current_cursor.map(|_| CursorStyle::DefaultUserShape));
if cursor_style != self.current_cursor
- && let Some(style) = cursor_style {
- self.current_cursor = cursor_style;
- let _ = execute!(stdout(), Self::cast_cursor_style(style));
- }
+ && let Some(style) = cursor_style
+ {
+ self.current_cursor = cursor_style;
+ let _ = execute!(stdout(), Self::cast_cursor_style(style));
+ }
}
pub fn initialize_keymap_cursor(&mut self, settings: &Settings) {
diff --git a/crates/atuin/src/command/client/store/pull.rs b/crates/atuin/src/command/client/store/pull.rs
index c701a1eb..df6e7346 100644
--- a/crates/atuin/src/command/client/store/pull.rs
+++ b/crates/atuin/src/command/client/store/pull.rs
@@ -57,9 +57,10 @@ impl Pull {
}
if let Some(t) = self.tag.clone()
- && t != *tag {
- return false;
- }
+ && t != *tag
+ {
+ return false;
+ }
true
}
diff --git a/crates/atuin/src/command/client/store/push.rs b/crates/atuin/src/command/client/store/push.rs
index fff378f0..78d119bc 100644
--- a/crates/atuin/src/command/client/store/push.rs
+++ b/crates/atuin/src/command/client/store/push.rs
@@ -77,9 +77,10 @@ impl Push {
}
if let Some(t) = self.tag.clone()
- && t != *tag {
- return false;
- }
+ && t != *tag
+ {
+ return false;
+ }
true
}