diff options
| author | Ray Kohler <ataraxia937@ataraxia937.xyz> | 2025-08-11 17:53:31 -0400 |
|---|---|---|
| committer | Ellie Huxtable <ellie@elliehuxtable.com> | 2025-09-10 12:57:43 -0700 |
| commit | 23b9e8a68c41885f73418cd93ebb84b78011f10f (patch) | |
| tree | d6ce0871e399763ab2470921c906d2f3249a7b44 /crates | |
| parent | fix: clean up new rustc and clippy warnings on Rust 1.89 (diff) | |
| download | atuin-23b9e8a68c41885f73418cd93ebb84b78011f10f.zip | |
fix: `cargo update` and changes needed to accomodate it
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/atuin-client/src/api_client.rs | 2 | ||||
| -rw-r--r-- | crates/atuin-server/src/handlers/record.rs | 5 | ||||
| -rw-r--r-- | crates/atuin-server/src/router.rs | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/crates/atuin-client/src/api_client.rs b/crates/atuin-client/src/api_client.rs index 78f374d6..73eb0e75 100644 --- a/crates/atuin-client/src/api_client.rs +++ b/crates/atuin-client/src/api_client.rs @@ -348,7 +348,7 @@ impl<'a> Client<'a> { ) -> Result<Vec<Record<EncryptedData>>> { debug!( "fetching record/s from host {}/{}/{}", - host.0.to_string(), + host.0, tag, start ); diff --git a/crates/atuin-server/src/handlers/record.rs b/crates/atuin-server/src/handlers/record.rs index 1400a923..59a10109 100644 --- a/crates/atuin-server/src/handlers/record.rs +++ b/crates/atuin-server/src/handlers/record.rs @@ -4,12 +4,11 @@ use tracing::instrument; use super::{ErrorResponse, ErrorResponseStatus, RespExt}; use crate::router::UserAuth; -use atuin_server_database::Database; use atuin_common::record::{EncryptedData, Record}; #[instrument(skip_all, fields(user.id = user.id))] -pub async fn post<DB: Database>( +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 @@ -27,7 +26,7 @@ pub async fn post<DB: Database>( } #[instrument(skip_all, fields(user.id = user.id))] -pub async fn index<DB: Database>(UserAuth(user): UserAuth) -> axum::response::Response { +pub async fn index(UserAuth(user): UserAuth) -> axum::response::Response { let ret = json!({ "hosts": {} }); diff --git a/crates/atuin-server/src/router.rs b/crates/atuin-server/src/router.rs index 6d168f63..1118ab29 100644 --- a/crates/atuin-server/src/router.rs +++ b/crates/atuin-server/src/router.rs @@ -123,8 +123,8 @@ pub fn router<DB: Database>(database: DB, settings: Settings) -> Router { .route("/account/password", patch(handlers::user::change_password)) .route("/register", post(handlers::user::register)) .route("/login", post(handlers::user::login)) - .route("/record", post(handlers::record::post::<DB>)) - .route("/record", get(handlers::record::index::<DB>)) + .route("/record", post(handlers::record::post)) + .route("/record", get(handlers::record::index)) .route("/record/next", get(handlers::record::next)) .route("/api/v0/me", get(handlers::v0::me::get)) .route("/api/v0/account/verify", post(handlers::user::verify_user)) |
