From 2aa42a34379d6c4fbe9d352f44d93dd625e8b113 Mon Sep 17 00:00:00 2001 From: aumetra Date: Sat, 16 Dec 2023 12:42:25 +0100 Subject: [PATCH] rename library --- Cargo.lock | 51 +++++++++++---------- Cargo.toml | 2 +- crates/kitsune-activitypub/Cargo.toml | 2 +- crates/kitsune-blocking/Cargo.toml | 2 +- crates/kitsune-cache/Cargo.toml | 2 +- crates/kitsune-captcha/Cargo.toml | 2 +- crates/kitsune-core/Cargo.toml | 2 +- crates/kitsune-db/Cargo.toml | 2 +- crates/kitsune-email/Cargo.toml | 2 +- crates/kitsune-embed/Cargo.toml | 2 +- crates/kitsune-federation-filter/Cargo.toml | 2 +- crates/kitsune-http-signatures/Cargo.toml | 2 +- crates/kitsune-mastodon/Cargo.toml | 2 +- crates/kitsune-oidc/Cargo.toml | 2 +- crates/kitsune-search/Cargo.toml | 2 +- crates/kitsune-service/Cargo.toml | 2 +- crates/kitsune-util/Cargo.toml | 2 +- kitsune/Cargo.toml | 2 +- lib/athena/Cargo.toml | 2 +- lib/{csurf => cursiv}/Cargo.toml | 2 +- lib/{csurf => cursiv}/README.md | 2 +- lib/{csurf => cursiv}/src/future.rs | 0 lib/{csurf => cursiv}/src/handle.rs | 0 lib/{csurf => cursiv}/src/layer.rs | 0 lib/{csurf => cursiv}/src/lib.rs | 0 lib/{csurf => cursiv}/src/service.rs | 0 lib/{csurf => cursiv}/tests/simple.rs | 2 +- lib/speedy-uuid/Cargo.toml | 2 +- 28 files changed, 48 insertions(+), 47 deletions(-) rename lib/{csurf => cursiv}/Cargo.toml (98%) rename lib/{csurf => cursiv}/README.md (96%) rename lib/{csurf => cursiv}/src/future.rs (100%) rename lib/{csurf => cursiv}/src/handle.rs (100%) rename lib/{csurf => cursiv}/src/layer.rs (100%) rename lib/{csurf => cursiv}/src/lib.rs (100%) rename lib/{csurf => cursiv}/src/service.rs (100%) rename lib/{csurf => cursiv}/tests/simple.rs (97%) diff --git a/Cargo.lock b/Cargo.lock index 69f54aceb..152ba4c7a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -863,8 +863,9 @@ dependencies = [ [[package]] name = "bubble-bath" -version = "0.1.0" -source = "git+https://github.com/aumetra/bubble-bath.git?rev=69522e28b7298d587fd7d036d065fab0e5daea22#69522e28b7298d587fd7d036d065fab0e5daea22" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0310632545de55ae183416a46ec13efac8704ad894fa746ae7af175cda255a4b" dependencies = [ "ahash 0.8.6", "bytecount", @@ -1092,7 +1093,7 @@ checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "client-sdk-common" version = "0.1.0" -source = "git+https://github.com/Lantern-chat/client-sdk-rs#13b49f504764cc458c655a0331bde631fd011a03" +source = "git+https://github.com/Lantern-chat/client-sdk-rs#dfbf2b53f5341e46ef6fd073233253ea9e76a961" dependencies = [ "rkyv", "serde", @@ -1402,24 +1403,6 @@ dependencies = [ "syn 2.0.41", ] -[[package]] -name = "csurf" -version = "0.0.1-pre.4" -dependencies = [ - "aliri_braid", - "async-trait", - "axum-core", - "blake3", - "cookie 0.18.0", - "futures", - "hex-simd", - "http", - "pin-project-lite", - "rand 0.8.5", - "tower", - "zeroize", -] - [[package]] name = "curl" version = "0.4.44" @@ -1451,6 +1434,24 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "cursiv" +version = "0.0.1-pre.4" +dependencies = [ + "aliri_braid", + "async-trait", + "axum-core", + "blake3", + "cookie 0.18.0", + "futures", + "hex-simd", + "http", + "pin-project-lite", + "rand 0.8.5", + "tower", + "zeroize", +] + [[package]] name = "curve25519-dalek" version = "4.1.1" @@ -6557,18 +6558,18 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 5bcc50f56..fdbe600f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,7 +44,7 @@ members = [ "kitsune-cli", "kitsune-job-runner", "lib/athena", - "lib/csurf", + "lib/cursiv", "lib/masto-id-convert", "lib/post-process", "lib/speedy-uuid", diff --git a/crates/kitsune-activitypub/Cargo.toml b/crates/kitsune-activitypub/Cargo.toml index 19cc3557d..3ef4395d5 100644 --- a/crates/kitsune-activitypub/Cargo.toml +++ b/crates/kitsune-activitypub/Cargo.toml @@ -35,7 +35,7 @@ serde = "1.0.193" sha2 = "0.10.8" simd-json = { version = "0.13.4", features = ["hints"] } speedy-uuid = { path = "../../lib/speedy-uuid" } -thiserror = "1.0.50" +thiserror = "1.0.51" tracing = "0.1.40" typed-builder = "0.18.0" url = "2.5.0" diff --git a/crates/kitsune-blocking/Cargo.toml b/crates/kitsune-blocking/Cargo.toml index 20ab225d2..5d4407bfe 100644 --- a/crates/kitsune-blocking/Cargo.toml +++ b/crates/kitsune-blocking/Cargo.toml @@ -7,7 +7,7 @@ version.workspace = true [dependencies] once_cell = "1.19.0" rayon = "1.8.0" -thiserror = "1.0.50" +thiserror = "1.0.51" tokio = { version = "1.35.0", features = ["rt", "sync"] } tracing = "0.1.40" diff --git a/crates/kitsune-cache/Cargo.toml b/crates/kitsune-cache/Cargo.toml index 00390c487..0eb291a93 100644 --- a/crates/kitsune-cache/Cargo.toml +++ b/crates/kitsune-cache/Cargo.toml @@ -11,7 +11,7 @@ moka = { version = "0.12.1", features = ["sync"] } redis = "0.23.3" serde = "1.0.193" simd-json = "0.13.4" -thiserror = "1.0.50" +thiserror = "1.0.51" tracing = "0.1.40" typed-builder = "0.18.0" diff --git a/crates/kitsune-captcha/Cargo.toml b/crates/kitsune-captcha/Cargo.toml index 29b70625a..ebf0f73db 100644 --- a/crates/kitsune-captcha/Cargo.toml +++ b/crates/kitsune-captcha/Cargo.toml @@ -12,7 +12,7 @@ serde = { version = "1.0.193", features = ["derive"] } serde_urlencoded = "0.7.1" simd-json = "0.13.4" strum = { version = "0.25.0", features = ["derive"] } -thiserror = "1.0.50" +thiserror = "1.0.51" typed-builder = "0.18.0" [lints] diff --git a/crates/kitsune-core/Cargo.toml b/crates/kitsune-core/Cargo.toml index a601e07a7..3e28ef698 100644 --- a/crates/kitsune-core/Cargo.toml +++ b/crates/kitsune-core/Cargo.toml @@ -13,7 +13,7 @@ kitsune-db = { path = "../kitsune-db" } kitsune-messaging = { path = "../kitsune-messaging" } serde = { version = "1.0.193", features = ["derive"] } speedy-uuid = { path = "../../lib/speedy-uuid", features = ["diesel"] } -thiserror = "1.0.50" +thiserror = "1.0.51" typed-builder = "0.18.0" [build-dependencies] diff --git a/crates/kitsune-db/Cargo.toml b/crates/kitsune-db/Cargo.toml index 7e7e52b6b..121e64931 100644 --- a/crates/kitsune-db/Cargo.toml +++ b/crates/kitsune-db/Cargo.toml @@ -25,7 +25,7 @@ num-traits = "0.2.17" serde = { version = "1.0.193", features = ["derive"] } simd-json = "0.13.4" speedy-uuid = { path = "../../lib/speedy-uuid", features = ["diesel"] } -thiserror = "1.0.50" +thiserror = "1.0.51" tracing-log = "0.2.0" typed-builder = "0.18.0" diff --git a/crates/kitsune-email/Cargo.toml b/crates/kitsune-email/Cargo.toml index 49ee47b37..2150ce40a 100644 --- a/crates/kitsune-email/Cargo.toml +++ b/crates/kitsune-email/Cargo.toml @@ -31,7 +31,7 @@ mrml = { version = "2.1.1", default-features = false, features = [ ] } scoped-futures = "0.1.3" speedy-uuid = { path = "../../lib/speedy-uuid" } -thiserror = "1.0.50" +thiserror = "1.0.51" typed-builder = "0.18.0" [lints] diff --git a/crates/kitsune-embed/Cargo.toml b/crates/kitsune-embed/Cargo.toml index ec4f4c73d..3871203cf 100644 --- a/crates/kitsune-embed/Cargo.toml +++ b/crates/kitsune-embed/Cargo.toml @@ -15,7 +15,7 @@ kitsune-http-client = { path = "../kitsune-http-client" } once_cell = "1.19.0" scraper = { version = "0.18.1", default-features = false } smol_str = "0.2.0" -thiserror = "1.0.50" +thiserror = "1.0.51" typed-builder = "0.18.0" [lints] diff --git a/crates/kitsune-federation-filter/Cargo.toml b/crates/kitsune-federation-filter/Cargo.toml index 46b2b7ab4..2e7131c75 100644 --- a/crates/kitsune-federation-filter/Cargo.toml +++ b/crates/kitsune-federation-filter/Cargo.toml @@ -9,7 +9,7 @@ globset = "0.4.14" kitsune-config = { path = "../kitsune-config" } kitsune-type = { path = "../kitsune-type" } miette = "5.10.0" -thiserror = "1.0.50" +thiserror = "1.0.51" url = "2.5.0" [lints] diff --git a/crates/kitsune-http-signatures/Cargo.toml b/crates/kitsune-http-signatures/Cargo.toml index 72960523e..c4544be07 100644 --- a/crates/kitsune-http-signatures/Cargo.toml +++ b/crates/kitsune-http-signatures/Cargo.toml @@ -14,7 +14,7 @@ time = { version = "0.3.30", default-features = false, features = [ "formatting", "parsing", ] } -thiserror = "1.0.50" +thiserror = "1.0.51" typed-builder = "0.18.0" [dev-dependencies] diff --git a/crates/kitsune-mastodon/Cargo.toml b/crates/kitsune-mastodon/Cargo.toml index 04bbc74ff..406864f99 100644 --- a/crates/kitsune-mastodon/Cargo.toml +++ b/crates/kitsune-mastodon/Cargo.toml @@ -24,7 +24,7 @@ serde = "1.0.193" simd-json = "0.13.4" smol_str = "0.2.0" speedy-uuid = { path = "../../lib/speedy-uuid" } -thiserror = "1.0.50" +thiserror = "1.0.51" tokio = { version = "1.35.0", features = ["rt"] } tracing = "0.1.40" typed-builder = "0.18.0" diff --git a/crates/kitsune-oidc/Cargo.toml b/crates/kitsune-oidc/Cargo.toml index 87bab4795..b412332f7 100644 --- a/crates/kitsune-oidc/Cargo.toml +++ b/crates/kitsune-oidc/Cargo.toml @@ -23,7 +23,7 @@ redis = "0.23.3" serde = { version = "1.0.193", features = ["derive"] } simd-json = "0.13.4" speedy-uuid = { path = "../../lib/speedy-uuid", features = ["serde"] } -thiserror = "1.0.50" +thiserror = "1.0.51" url = "2.5.0" [lints] diff --git a/crates/kitsune-search/Cargo.toml b/crates/kitsune-search/Cargo.toml index 230382ff4..fd155d129 100644 --- a/crates/kitsune-search/Cargo.toml +++ b/crates/kitsune-search/Cargo.toml @@ -19,7 +19,7 @@ miette = "5.10.0" serde = { version = "1.0.193", features = ["derive"] } speedy-uuid = { path = "../../lib/speedy-uuid" } strum = { version = "0.25.0", features = ["derive"] } -thiserror = "1.0.50" +thiserror = "1.0.51" tracing = "0.1.40" # "meilisearch" feature diff --git a/crates/kitsune-service/Cargo.toml b/crates/kitsune-service/Cargo.toml index a28366ae9..14a2283b6 100644 --- a/crates/kitsune-service/Cargo.toml +++ b/crates/kitsune-service/Cargo.toml @@ -55,7 +55,7 @@ serde = "1.0.193" simd-json = "0.13.4" smol_str = "0.2.0" speedy-uuid = { path = "../../lib/speedy-uuid" } -thiserror = "1.0.50" +thiserror = "1.0.51" tokio = { version = "1.35.0", features = ["macros"] } tracing = "0.1.40" typed-builder = "0.18.0" diff --git a/crates/kitsune-util/Cargo.toml b/crates/kitsune-util/Cargo.toml index 39e26c0b3..3b7f211af 100644 --- a/crates/kitsune-util/Cargo.toml +++ b/crates/kitsune-util/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true version.workspace = true [dependencies] -bubble-bath = { git = "https://github.com/aumetra/bubble-bath.git", rev = "69522e28b7298d587fd7d036d065fab0e5daea22" } +bubble-bath = "0.1.1" iso8601-timestamp = "0.2.13" kitsune-type = { path = "../kitsune-type" } once_cell = "1.19.0" diff --git a/kitsune/Cargo.toml b/kitsune/Cargo.toml index 1997b83f2..50aba2c92 100644 --- a/kitsune/Cargo.toml +++ b/kitsune/Cargo.toml @@ -81,7 +81,7 @@ simd-json = "0.13.4" speedy-uuid = { path = "../lib/speedy-uuid" } strum = { version = "0.25.0", features = ["derive", "phf"] } tempfile = "3.8.1" -thiserror = "1.0.50" +thiserror = "1.0.51" time = "0.3.30" tokio = { version = "1.35.0", features = ["full"] } tokio-util = { version = "0.7.10", features = ["compat"] } diff --git a/lib/athena/Cargo.toml b/lib/athena/Cargo.toml index d67cdf59a..69505577d 100644 --- a/lib/athena/Cargo.toml +++ b/lib/athena/Cargo.toml @@ -26,7 +26,7 @@ serde = { version = "1.0.193", features = ["derive"] } simd-json = "0.13.4" smol_str = "0.2.0" speedy-uuid = { path = "../speedy-uuid", features = ["redis", "serde"] } -thiserror = "1.0.50" +thiserror = "1.0.51" tokio = { version = "1.35.0", features = ["macros", "rt", "sync"] } tracing = "0.1.40" typed-builder = "0.18.0" diff --git a/lib/csurf/Cargo.toml b/lib/cursiv/Cargo.toml similarity index 98% rename from lib/csurf/Cargo.toml rename to lib/cursiv/Cargo.toml index e8d6973dc..332cad1bb 100644 --- a/lib/csurf/Cargo.toml +++ b/lib/cursiv/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "csurf" +name = "cursiv" authors.workspace = true edition.workspace = true version.workspace = true diff --git a/lib/csurf/README.md b/lib/cursiv/README.md similarity index 96% rename from lib/csurf/README.md rename to lib/cursiv/README.md index 035641ce7..4849fb9ca 100644 --- a/lib/csurf/README.md +++ b/lib/cursiv/README.md @@ -1,4 +1,4 @@ -# csurf +# cursiv Small stateless CSRF crate for tower-based frameworks diff --git a/lib/csurf/src/future.rs b/lib/cursiv/src/future.rs similarity index 100% rename from lib/csurf/src/future.rs rename to lib/cursiv/src/future.rs diff --git a/lib/csurf/src/handle.rs b/lib/cursiv/src/handle.rs similarity index 100% rename from lib/csurf/src/handle.rs rename to lib/cursiv/src/handle.rs diff --git a/lib/csurf/src/layer.rs b/lib/cursiv/src/layer.rs similarity index 100% rename from lib/csurf/src/layer.rs rename to lib/cursiv/src/layer.rs diff --git a/lib/csurf/src/lib.rs b/lib/cursiv/src/lib.rs similarity index 100% rename from lib/csurf/src/lib.rs rename to lib/cursiv/src/lib.rs diff --git a/lib/csurf/src/service.rs b/lib/cursiv/src/service.rs similarity index 100% rename from lib/csurf/src/service.rs rename to lib/cursiv/src/service.rs diff --git a/lib/csurf/tests/simple.rs b/lib/cursiv/tests/simple.rs similarity index 97% rename from lib/csurf/tests/simple.rs rename to lib/cursiv/tests/simple.rs index 044ba38e5..95d5de84a 100644 --- a/lib/csurf/tests/simple.rs +++ b/lib/cursiv/tests/simple.rs @@ -1,4 +1,4 @@ -use csurf::{CsrfHandle, CsrfLayer, Message}; +use cursiv::{CsrfHandle, CsrfLayer, Message}; use futures::{executor, future}; use http::{header, Request, Response}; use std::convert::Infallible; diff --git a/lib/speedy-uuid/Cargo.toml b/lib/speedy-uuid/Cargo.toml index 6a88d0162..34d20d962 100644 --- a/lib/speedy-uuid/Cargo.toml +++ b/lib/speedy-uuid/Cargo.toml @@ -12,7 +12,7 @@ diesel = { version = "2.1.4", features = [ ], optional = true } redis = { version = "0.23.3", default-features = false, optional = true } serde = { version = "1.0.193", optional = true } -thiserror = "1.0.50" +thiserror = "1.0.51" uuid = { version = "1.6.1", features = ["fast-rng", "v7"] } uuid-simd = { version = "0.8.0", features = ["unstable", "uuid"] }