aboutsummaryrefslogtreecommitdiffstats
path: root/crates/atuin-client
diff options
context:
space:
mode:
authorEllie Huxtable <ellie@elliehuxtable.com>2024-05-02 16:53:38 +0100
committerGitHub <noreply@github.com>2024-05-02 16:53:38 +0100
commit0639ff49604a44b3c487110860f511ac9b426e60 (patch)
treec4a2f597e5477f01e6111565758aa3b0c192c8d5 /crates/atuin-client
parentrefactor: preview_auto to use enum and different option (#1991) (diff)
downloadatuin-0639ff49604a44b3c487110860f511ac9b426e60.zip
fix(dotfiles): allow clearing aliases, disable import (#1995)
* fix(dotfiles): allow clearing aliases, disable import At the moment there are far too many edge cases to handle importing aliases. 1. We need an interactive shell to print aliases. Without it, most shells won't report much. 2. Many people have their shells print things on startup (graphics, fortunes, etc). This could be detected as an attempt to set an alias. Rather than spend the next year finding import edge cases, I'm disabling it for now. There's probably a better way we can do this? * clippy
Diffstat (limited to 'crates/atuin-client')
-rw-r--r--crates/atuin-client/src/sync.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/atuin-client/src/sync.rs b/crates/atuin-client/src/sync.rs
index 1f0d3dd8..0a5021cb 100644
--- a/crates/atuin-client/src/sync.rs
+++ b/crates/atuin-client/src/sync.rs
@@ -37,7 +37,7 @@ async fn sync_download(
key: &Key,
force: bool,
client: &api_client::Client<'_>,
- db: &(impl Database + Send),
+ db: &impl Database,
) -> Result<(i64, i64)> {
debug!("starting sync download");
@@ -127,7 +127,7 @@ async fn sync_upload(
key: &Key,
_force: bool,
client: &api_client::Client<'_>,
- db: &(impl Database + Send),
+ db: &impl Database,
) -> Result<()> {
debug!("starting sync upload");
@@ -188,7 +188,7 @@ async fn sync_upload(
Ok(())
}
-pub async fn sync(settings: &Settings, force: bool, db: &(impl Database + Send)) -> Result<()> {
+pub async fn sync(settings: &Settings, force: bool, db: &impl Database) -> Result<()> {
let client = api_client::Client::new(
&settings.sync_address,
&settings.session_token,