Skip to content

Commit

Permalink
more
Browse files Browse the repository at this point in the history
  • Loading branch information
aumetra committed Dec 1, 2024
1 parent 9ef4b34 commit 8e9da0b
Show file tree
Hide file tree
Showing 27 changed files with 53 additions and 58 deletions.
6 changes: 0 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ members = [
resolver = "2"

[workspace.dependencies]
ahash = "0.8.11"
argon2 = { version = "0.5.3", features = ["std"] }
async-graphql = { version = "7.0.11", default-features = false, features = [
"graphiql",
Expand All @@ -89,6 +90,7 @@ async-graphql = { version = "7.0.11", default-features = false, features = [
] }
asynk-strim = "0.1.2"
async-trait = "0.1.83"
axum-core = "0.4.5"
base64-simd = "0.8.0"
bytes = "1.9.0"
chrono = { version = "0.4.38", default-features = false }
Expand All @@ -107,6 +109,9 @@ diesel-async = { version = "0.5.2", features = [
"tokio",
] }
diesel_full_text_search = { version = "2.2.0", default-features = false }
divan = "0.1.16"
either = { version = "1.13.0", default-features = false }
enum_dispatch = "0.3.13"
eyre = "0.6.12"
fred = { version = "10.0.0", features = [
"enable-rustls-ring",
Expand All @@ -115,6 +120,7 @@ fred = { version = "10.0.0", features = [
"sha-1",
"unix-sockets",
] }
futures-test = "0.3.31"
futures-util = { version = "0.3.31", default-features = false, features = [
"alloc",
] }
Expand All @@ -126,6 +132,7 @@ garde = { version = "0.20.0", features = [
"serde",
] }
headers = "0.4.0"
hex-simd = "0.8.0"
hickory-resolver = { version = "0.25.0-alpha.4", default-features = false, features = [
"dns-over-rustls",
"native-certs",
Expand All @@ -136,23 +143,27 @@ http-body = "1.0.1"
http-body-util = "0.1.2"
iso8601-timestamp = { version = "0.3.1", features = ["diesel-pg"] }
itertools = { version = "0.13.0", default-features = false }
memchr = "2.7.4"
mimalloc = "0.1.43"
mime = "0.3.17"
mime_guess = { version = "2.0.5", default-features = false }
minijinja = { version = "2.5.0", features = ["loader"] }
moka = { version = "=0.12.7", features = ["sync"] }
pin-project-lite = "0.2.15"
rand = "0.8.5"
regex = "1.11.1"
sailfish = { version = "0.9.0", default-features = false, features = [
"derive",
"perf-inline",
] }
scoped-futures = { version = "0.1.4", default-features = false }
serde = { version = "1.0.215", features = ["derive"] }
sha2 = "0.10.8"
simdutf8 = { version = "0.1.5", features = ["aarch64_neon"] }
smol_str = { version = "0.3.2", features = ["serde"] }
sonic-rs = "=0.3.14"
strum = { version = "0.26.3", features = ["derive"] }
subtle = "2.6.1"
tempfile = "3.14.0"
thiserror = "2.0.3"
time = "0.3.36"
Expand Down Expand Up @@ -183,6 +194,7 @@ triomphe = { version = "0.1.14", default-features = false, features = [
"unsize",
] }
typed-builder = "0.20.0"
unsize = "1.1.0"
url = "2.5.4"
uuid = { version = "1.11.0", features = ["fast-rng", "v7"] }

Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-activitypub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ kitsune-wasm-mrf.workspace = true
mime.workspace = true
mime_guess.workspace = true
serde.workspace = true
sha2 = "0.10.8"
sha2.workspace = true
sonic-rs.workspace = true
speedy-uuid.workspace = true
tracing.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-cache/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version.workspace = true
license.workspace = true

[dependencies]
enum_dispatch = "0.3.13"
enum_dispatch.workspace = true
fred.workspace = true
kitsune-error.workspace = true
moka.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-captcha/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition.workspace = true
license.workspace = true

[dependencies]
enum_dispatch = "0.3.13"
enum_dispatch.workspace = true
http.workspace = true
kitsune-error.workspace = true
kitsune-http-client.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ paste = "1.0.15"
serde.workspace = true
triomphe.workspace = true
typed-builder.workspace = true
unsize = "1.1.0"
unsize.workspace = true

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/kitsune-error/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version.workspace = true
license.workspace = true

[dependencies]
axum-core = "0.4.5"
axum-core.workspace = true
eyre.workspace = true
garde.workspace = true
http.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-oidc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version.workspace = true
license.workspace = true

[dependencies]
enum_dispatch = "0.3.13"
enum_dispatch.workspace = true
fred.workspace = true
http-body-util.workspace = true
kitsune-config.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-search/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bytes.workspace = true
diesel.workspace = true
diesel-async.workspace = true
diesel_full_text_search.workspace = true
enum_dispatch = "0.3.13"
enum_dispatch.workspace = true
futures-util.workspace = true
http.workspace = true
kitsune-config.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/kitsune-service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version.workspace = true
license.workspace = true

[dependencies]
ahash = "0.8.11"
ahash.workspace = true
argon2.workspace = true
asynk-strim.workspace = true
athena.workspace = true
Expand Down Expand Up @@ -56,7 +56,7 @@ url.workspace = true
zxcvbn = { version = "3.1.0", default-features = false }

[dev-dependencies]
hex-simd = "0.8.0"
hex-simd.workspace = true
http-body-util.workspace = true
hyper = "1.5.1"
kitsune-activitypub.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-wasm-mrf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ async-trait.workspace = true
blake3 = "1.5.5"
color-eyre.workspace = true
derive_more = { version = "1.0.0", features = ["from"] }
enum_dispatch = "0.3.13"
enum_dispatch.workspace = true
fred.workspace = true
futures-util.workspace = true
http.workspace = true
Expand Down
6 changes: 3 additions & 3 deletions lib/athena/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ name = "basic_queue"
required-features = ["redis"]

[dependencies]
ahash = "0.8.11"
ahash.workspace = true
async-trait.workspace = true
either = { version = "1.13.0", default-features = false, optional = true }
either = { workspace = true, optional = true }
futures-util.workspace = true
iso8601-timestamp.workspace = true
fred = { workspace = true, optional = true }
Expand All @@ -29,7 +29,7 @@ tracing.workspace = true
triomphe.workspace = true
typed-builder.workspace = true
typetag = "0.2.18"
unsize = "1.1.0"
unsize.workspace = true

[features]
redis = ["dep:either", "dep:fred", "dep:rand", "dep:sonic-rs"]
Expand Down
6 changes: 3 additions & 3 deletions lib/cursiv/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0"
aliri_braid = "0.4.0"
blake3 = "1.5.5"
cookie = { version = "0.18.1", features = ["percent-encode"] }
hex-simd = "0.8.0"
hex-simd.workspace = true
http.workspace = true
pin-project-lite.workspace = true
rand.workspace = true
Expand All @@ -19,10 +19,10 @@ zeroize = { version = "1.8.1", features = ["derive"] }

# `axum` feature
async-trait = { workspace = true, optional = true }
axum-core = { version = "0.4.5", optional = true }
axum-core = { workspace = true, optional = true }

[dev-dependencies]
futures-test = "0.3.31"
futures-test.workspace = true
tower.workspace = true

[features]
Expand Down
4 changes: 2 additions & 2 deletions lib/fast-cjson/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ harness = false

[dependencies]
icu_normalizer = "1.5.0"
memchr = "2.7.4"
memchr.workspace = true
serde.workspace = true
sonic-rs.workspace = true

[dev-dependencies]
divan = "0.1.16"
divan.workspace = true
mimalloc.workspace = true
olpc-cjson = "0.1.4"
proptest = { version = "1.5.0", default-features = false, features = ["std"] }
Expand Down
2 changes: 1 addition & 1 deletion lib/geomjeungja/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ thiserror.workspace = true
tracing.workspace = true
triomphe.workspace = true
typed-builder.workspace = true
unsize = "1.1.0"
unsize.workspace = true

[dev-dependencies]
insta = { version = "1.41.1", features = ["json"] }
Expand Down
2 changes: 1 addition & 1 deletion lib/http-signatures/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ tick-tock-mock.workspace = true
tracing = { workspace = true, optional = true }

[dev-dependencies]
divan = "0.1.16"
divan.workspace = true
tokio.workspace = true

[features]
Expand Down
2 changes: 1 addition & 1 deletion lib/masto-id-convert/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ nanorand = { version = "0.7.0", default-features = false, features = [
uuid.workspace = true

[dev-dependencies]
divan = "0.1.16"
divan.workspace = true
time.workspace = true
uuid.workspace = true

Expand Down
2 changes: 1 addition & 1 deletion lib/post-process/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ harness = false
logos = "0.14.2"

[dev-dependencies]
divan = "0.1.16"
divan.workspace = true
futures-executor = "0.3.31"
insta = { version = "1.41.1", features = ["glob"] }
pretty_assertions = "1.4.1"
Expand Down
2 changes: 1 addition & 1 deletion lib/tick-tock-mock/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ harness = false
[dependencies]

[dev-dependencies]
divan = "0.1.16"
divan.workspace = true

[lints]
workspace = true
13 changes: 6 additions & 7 deletions lib/tower-http-digest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,19 @@ license = "MIT OR Apache-2.0"
[dependencies]
base64-simd.workspace = true
bytes.workspace = true
either = { version = "1.13.0", default-features = false }
either.workspace = true
http.workspace = true
http-body.workspace = true
memchr = "2.7.4"
memchr.workspace = true
pin-project-lite.workspace = true
sha2 = "0.10.8"
subtle = "2.6.1"
tower-layer = "0.3.3"
tower-service = "0.3.3"
sha2.workspace = true
subtle.workspace = true
tower.workspace = true
tracing.workspace = true

[dev-dependencies]
bytes.workspace = true
futures-test = "0.3.31"
futures-test.workspace = true
http-body-util.workspace = true
tower.workspace = true

Expand Down
6 changes: 1 addition & 5 deletions lib/tower-http-digest/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,12 @@ use memchr::memchr;
use pin_project_lite::pin_project;
use sha2::{digest::FixedOutput, Digest, Sha256, Sha512};
use std::{
error::Error as StdError,
future::{self, Ready},
pin::Pin,
task::{self, ready, Poll},
};
use subtle::ConstantTimeEq;
use tower_layer::Layer;
use tower_service::Service;

type BoxError = Box<dyn StdError + Send + Sync>;
use tower::{BoxError, Layer, Service};

static DIGEST_HEADER_NAME: HeaderName = HeaderName::from_static("digest");

Expand Down
3 changes: 1 addition & 2 deletions lib/tower-http-digest/tests/digest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ use bytes::Bytes;
use http::{Request, Response, StatusCode};
use http_body_util::{BodyExt, Full};
use std::convert::Infallible;
use tower::{service_fn, ServiceExt};
use tower::{service_fn, Layer, ServiceExt};
use tower_http_digest::{VerifyDigestBody, VerifyDigestLayer};
use tower_layer::Layer;

const TEXT: &str = r"Una sombra abajo de mi cama
Cómo se llama éste fantasma?
Expand Down
9 changes: 4 additions & 5 deletions lib/tower-stop-using-brave/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@ version.workspace = true
license = "MIT OR Apache-2.0"

[dependencies]
either = "1.13.0"
either.workspace = true
http.workspace = true
regex = "1.11.1"
tower-layer = "0.3.3"
tower-service = "0.3.3"
regex.workspace = true
tower.workspace = true

[dev-dependencies]
futures-test = "0.3.31"
futures-test.workspace = true
tower.workspace = true

[lints]
Expand Down
3 changes: 1 addition & 2 deletions lib/tower-stop-using-brave/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ use std::{
sync::LazyLock,
task::{self, Poll},
};
use tower_layer::Layer;
use tower_service::Service;
use tower::{Layer, Service};

static REDIRECT_URL: &str = "https://www.spacebar.news/stop-using-brave-browser/";
static USER_AGENT_REGEX: LazyLock<Regex> = LazyLock::new(|| {
Expand Down
5 changes: 2 additions & 3 deletions lib/tower-x-clacks-overhead/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ license = "MIT OR Apache-2.0"
http.workspace = true
itertools.workspace = true
pin-project-lite.workspace = true
tower-layer = "0.3.3"
tower-service = "0.3.3"
tower.workspace = true
triomphe.workspace = true

[dev-dependencies]
futures-test = "0.3.31"
futures-test.workspace = true
tower.workspace = true

[lints]
Expand Down
Loading

0 comments on commit 8e9da0b

Please sign in to comment.