From c2bad4bb942e5252b1fcd90d56ad10663ab133fd Mon Sep 17 00:00:00 2001 From: Joe Ardent Date: Sun, 14 Jan 2024 17:02:25 -0800 Subject: [PATCH] update julid version --- Cargo.lock | 68 ++++++++++++++++++++--------------------- src/bin/mkinvites.rs | 2 +- src/signup/handlers.rs | 6 ++-- src/watches/handlers.rs | 6 ++-- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7c40a3b..777045c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,9 +62,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba" dependencies = [ "anstyle", "anstyle-parse", @@ -225,9 +225,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09dbe0e490df5da9d69b36dca48a76635288a82f92eca90024883a56202026d" +checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e" dependencies = [ "async-trait", "axum-core", @@ -260,9 +260,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c8503f93e6d144ee5690907ba22db7ba79ab001a932ab99034f0fe836b3df" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", @@ -301,9 +301,9 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a2edad600410b905404c594e2523549f1bcd4bded1e252c8f74524ccce0b867" +checksum = "00c055ee2d014ae5981ce1016374e8213682aa14d9bf40e48ab48b5f3ef20eaa" dependencies = [ "heck", "proc-macro2", @@ -357,9 +357,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -457,9 +457,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.14" +version = "4.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33e92c5c1a78c62968ec57dbc2440366a2d6e5a23faf829970ff1585dc6b18e2" +checksum = "58e54881c004cec7895b0068a0a954cd5d62da01aef83fa35b1e594497bf5445" dependencies = [ "clap_builder", "clap_derive", @@ -467,9 +467,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.14" +version = "4.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4323769dc8a61e2c39ad7dc26f6f2800524691a44d74fe3d1071a5c24db6370" +checksum = "59cb82d7f531603d2fd1f507441cdd35184fa81beff7bd489570de7f773460bb" dependencies = [ "anstream", "anstyle", @@ -1085,18 +1085,18 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] [[package]] name = "julid-rs" -version = "1.6.180339" +version = "1.6.1803398" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35d2c64cb630d89e4e193437d73b203fcefe40ad97e1b9c5faf247e92471e553" +checksum = "98270c2a07b60873e7b164cebea22f83bbe42632c9774c5360e0f7ef0a63986d" dependencies = [ "chrono", "clap", @@ -1759,9 +1759,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ "bitflags 2.4.1", "errno", @@ -1914,9 +1914,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" [[package]] name = "socket2" @@ -2409,9 +2409,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e12e6351354851911bdf8c2b8f2ab15050c567d70a8b9a37ae7b8301a4080d" +checksum = "0da193277a4e2c33e59e09b5861580c33dd0a637c3883d0fa74ba40c0374af2e" dependencies = [ "bitflags 2.4.1", "bytes", @@ -2706,9 +2706,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2716,9 +2716,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", "log", @@ -2731,9 +2731,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2741,9 +2741,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ "proc-macro2", "quote", @@ -2754,9 +2754,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "what2watch" diff --git a/src/bin/mkinvites.rs b/src/bin/mkinvites.rs index 168b3fc..e6c7505 100644 --- a/src/bin/mkinvites.rs +++ b/src/bin/mkinvites.rs @@ -27,7 +27,7 @@ struct Iq { fn main() { let cli = Cli::parse(); let num = cli.number; - let owner = Julid::from_string(&cli.owner).expect("Malformed ID given for owner"); + let owner = Julid::from_str(&cli.owner).expect("Malformed ID given for owner"); let expires = cli .expires_in .map(|e| parse(&e).expect("Could not parse {e} as a duration")); diff --git a/src/signup/handlers.rs b/src/signup/handlers.rs index 038dcdd..8487b80 100644 --- a/src/signup/handlers.rs +++ b/src/signup/handlers.rs @@ -81,7 +81,7 @@ pub async fn get_create_user( ) -> Result { let invitation = invitation.ok_or(CreateUserErrorKind::BadInvitation)?; let invitation = - Julid::from_string(&invitation.0).map_err(|_| CreateUserErrorKind::BadInvitation)?; + Julid::from_str(&invitation.0).map_err(|_| CreateUserErrorKind::BadInvitation)?; Ok(SignupPage { invitation, @@ -148,7 +148,7 @@ pub async fn get_signup_success( State(pool): State, ) -> Response { let id = id.trim(); - let id = Julid::from_string(id).unwrap_or_default(); + let id = Julid::from_str(id).unwrap_or_default(); let user: User = { query_as(ID_QUERY) .bind(id) @@ -197,7 +197,7 @@ pub(crate) async fn create_user( })?; let invitation = - Julid::from_string(invitation).map_err(|_| CreateUserErrorKind::BadInvitation)?; + Julid::from_str(invitation).map_err(|_| CreateUserErrorKind::BadInvitation)?; let invited_by = validate_invitation(invitation, &mut tx).await?; diff --git a/src/watches/handlers.rs b/src/watches/handlers.rs index 5aad709..b95958e 100644 --- a/src/watches/handlers.rs +++ b/src/watches/handlers.rs @@ -169,7 +169,7 @@ pub async fn post_add_watch_quest( if let Some(user) = auth.user { let quest = WatchQuest { user: user.id, - watch: Julid::from_string(&form.watch).unwrap(), + watch: Julid::from_str(&form.watch).unwrap(), public: form.public, watched: false, }; @@ -213,7 +213,7 @@ pub async fn get_watch( "".to_string() }; let id = id.trim(); - let id = Julid::from_string(id).unwrap_or_default(); + let id = Julid::from_str(id).unwrap_or_default(); let q = query_as(GET_WATCH_QUERY).bind(id); let watch: Option = q.fetch_one(&pool).await.ok(); @@ -271,7 +271,7 @@ pub async fn get_watch_status( Path(watch): Path, ) -> Result { if let Some(user) = auth.user { - let watch = Julid::from_string(&watch).unwrap(); + let watch = Julid::from_str(&watch).unwrap(); let quest: Option = query_as(GET_QUEST_QUERY) .bind(user.id) .bind(watch)