Skip to content

Commit 3f3f735

Browse files
aumetraaumetra
authored
Update dependencies and sonic-rs commit (#544)
* Update dependencies and sonic-rs commit * flake.lock: Update Flake lock file updates: • Updated input 'crane': 'github:ipetkov/crane/7e468a455506f2e65550e08dfd45092f0857a009' (2024-03-25) → 'github:ipetkov/crane/480dff0be03dac0e51a8dfc26e882b0d123a450e' (2024-05-29) • Updated input 'devenv': 'github:cachix/devenv/19098329b4e79f60705d7fb241a3617266658f98' (2024-03-29) → 'github:cachix/devenv/c3f9f053c077c6f88a3de5276d9178c62baa3fc3' (2024-06-01) • Updated input 'devenv/cachix': 'github:cachix/cachix/661bbb7f8b55722a0406456b15267b5426a3bda6' (2024-03-15) → 'github:cachix/cachix/02e38da89851ec7fec3356a5c04bc8349cae0e30' (2024-04-02) • Updated input 'devenv/cachix/devenv/nix': 'github:domenkozar/nix/ecd0af0c1f56de32cbad14daa1d82a132bf298f8' (2024-02-22) → 'github:domenkozar/nix/b24a9318ea3f3600c1e24b4a00691ee912d4de12' (2024-04-12) • Updated input 'devenv/cachix/flake-compat': 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04) → follows 'devenv/flake-compat' • Updated input 'devenv/cachix/pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/5df5a70ad7575f6601d91f0efec95dd9bc619431' (2024-02-15) → follows 'devenv/pre-commit-hooks' • Removed input 'devenv/cachix/pre-commit-hooks/flake-compat' • Removed input 'devenv/cachix/pre-commit-hooks/flake-utils' • Removed input 'devenv/cachix/pre-commit-hooks/flake-utils/systems' • Removed input 'devenv/cachix/pre-commit-hooks/gitignore' • Removed input 'devenv/cachix/pre-commit-hooks/gitignore/nixpkgs' • Removed input 'devenv/cachix/pre-commit-hooks/nixpkgs' • Removed input 'devenv/cachix/pre-commit-hooks/nixpkgs-stable' • Updated input 'devenv/nix': 'github:domenkozar/nix/c5bbf14ecbd692eeabf4184cc8d50f79c2446549' (2024-03-15) → 'github:domenkozar/nix/b24a9318ea3f3600c1e24b4a00691ee912d4de12' (2024-04-12) • Updated input 'devenv/nix/flake-compat': 'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17) → follows 'devenv/flake-compat' • Updated input 'devenv/pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/5df5a70ad7575f6601d91f0efec95dd9bc619431' (2024-02-15) → 'github:cachix/pre-commit-hooks.nix/2ac4dcbf55ed43f3be0bae15e181f08a57af24a4' (2024-04-22) • Updated input 'devenv/pre-commit-hooks/flake-utils': 'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04) → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11) • Updated input 'devenv/pre-commit-hooks/gitignore': 'github:hercules-ci/gitignore.nix/43e1aa1308018f37118e34d3a9cb4f5e75dc11d5' (2023-12-29) → 'github:hercules-ci/gitignore.nix/637db329424fd7e46cf4185293b9cc8c88c95394' (2024-02-28) • Updated input 'devenv/pre-commit-hooks/nixpkgs-stable': 'github:NixOS/nixpkgs/3dc440faeee9e889fe2d1b4d25ad0f430d449356' (2024-01-10) → 'github:NixOS/nixpkgs/614b4613980a522ba49f0d194531beddbb7220d3' (2024-03-17) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/2726f127c15a4cc9810843b96cad73c7eb39e443' (2024-03-27) → 'github:nixos/nixpkgs/ad57eef4ef0659193044870c731987a6df5cf56b' (2024-05-29) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/42a168449605950935f15ea546f6f770e5f7f629' (2024-03-29) → 'github:oxalica/rust-overlay/ab69b67fac9a96709fbef0b899db308ca714a120' (2024-06-01) * fix compile error * use new define_sql_function macro
1 parent 8ff4d08 commit 3f3f735

File tree

30 files changed

+188
-336
lines changed

30 files changed

+188
-336
lines changed

‎Cargo.lock

+89-99
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ askama = { version = "0.12.1", default-features = false, features = [
7979
"with-axum",
8080
] }
8181
clap = { version = "4.5.4", features = ["derive", "wrap_help"] }
82-
diesel = { version = "2.1.6", default-features = false, features = [
82+
diesel = { version = "2.2.0", default-features = false, features = [
8383
"32-column-tables",
8484
"with-deprecated",
8585
] }
@@ -89,7 +89,7 @@ diesel-async = { version = "0.4.1", features = [
8989
"postgres",
9090
"tokio",
9191
] }
92-
diesel_full_text_search = { version = "2.1.1", default-features = false }
92+
diesel_full_text_search = { version = "2.2.0", default-features = false }
9393
fred = { version = "9.0.3", features = [
9494
"enable-rustls-ring",
9595
"full-tracing",
@@ -107,7 +107,7 @@ itertools = { version = "0.13.0", default-features = false }
107107
moka = { version = "0.12.7", features = ["sync"] }
108108
simdutf8 = { version = "0.1.4", features = ["aarch64_neon"] }
109109
sonic-rs = "0.3.6"
110-
triomphe = { version = "0.1.11", default-features = false, features = [
110+
triomphe = { version = "0.1.12", default-features = false, features = [
111111
"unsize",
112112
] }
113113

@@ -208,12 +208,12 @@ pr-run-mode = "plan"
208208
install-updater = true
209209

210210
[patch.crates-io]
211-
diesel-async = { git = "https://github.com/weiznich/diesel_async.git", rev = "d02798c67065d763154d7272dd0c09b39757d0f2" }
211+
diesel-async = { git = "https://github.com/weiznich/diesel_async.git", rev = "3bc6789daf73563d59ed4f174241a23e9cb86686" }
212212
scraper = { git = "https://github.com/causal-agent/scraper.git", rev = "d67111f5cc0b7da6e6ff10e4549d87cf09ba3e5b" }
213213
tokio-postgres-rustls = { git = "https://github.com/jbg/tokio-postgres-rustls.git", rev = "b16c1bc0f5d4f91324174fd1bd839d743a70f86a" }
214214

215215
# SIMD runtime detection
216-
sonic-rs = { git = "https://github.com/aumetra/sonic-rs.git", rev = "d1f172d75e7c9386fde169673d2666e0cfd5d32c" }
216+
sonic-rs = { git = "https://github.com/aumetra/sonic-rs.git", rev = "a5ac253f8389a34257dae2da79db3f535311ed65" }
217217

218218
# TCP nodelay for `axum::serve`
219219
axum = { git = "https://github.com/tokio-rs/axum.git", rev = "8d0c5c05eb75eb779591c8000705e785123868a0" }
@@ -225,4 +225,4 @@ opentelemetry-http = { git = "https://github.com/open-telemetry/opentelemetry-ru
225225
opentelemetry-otlp = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "40fb924215c84d6e3818351b2c0e3d2ba01a7db9" }
226226
opentelemetry_sdk = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "40fb924215c84d6e3818351b2c0e3d2ba01a7db9" }
227227
tonic = { git = "https://github.com/hyperium/tonic.git", rev = "a90adf27ef389a9c9d891c3f5696e6245589c479" }
228-
tracing-opentelemetry = { git = "https://github.com/aumetra/tracing-opentelemetry.git", rev = "e6e16057f6e3b2a11f6f8e7c86a1c17e4f7a07f1" }
228+
tracing-opentelemetry = { git = "https://github.com/aumetra/tracing-opentelemetry.git", rev = "b7fe8d5d056e43f913a85eac1e6a661226b49c43" }

‎crates/kitsune-activitypub/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ kitsune-config = { workspace = true }
5050
kitsune-test = { workspace = true }
5151
kitsune-webfinger = { workspace = true }
5252
pretty_assertions = "1.4.0"
53-
tokio = { version = "1.37.0", features = ["macros"] }
53+
tokio = { version = "1.38.0", features = ["macros"] }
5454
tower = { version = "0.4.13", default-features = false, features = ["util"] }
5555

5656
[lints]

‎crates/kitsune-cache/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ triomphe = { workspace = true }
1717
typed-builder = "0.18.2"
1818

1919
[dev-dependencies]
20-
tokio = { version = "1.37.0", features = ["macros", "rt"] }
20+
tokio = { version = "1.38.0", features = ["macros", "rt"] }
2121

2222
[lints]
2323
workspace = true

‎crates/kitsune-config/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ human-size = { version = "0.4.3", features = ["serde"] }
1111
isolang = { version = "2.4.0", features = ["serde"] }
1212
serde = { version = "1.0.203", features = ["derive"] }
1313
smol_str = { version = "0.2.2", features = ["serde"] }
14-
tokio = { version = "1.37.0", features = ["fs"] }
14+
tokio = { version = "1.38.0", features = ["fs"] }
1515
toml = { version = "0.8.13", default-features = false, features = ["parse"] }
1616

1717
[lints]

‎crates/kitsune-db/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ blowocking = { workspace = true, features = ["io"] }
1111
diesel = { workspace = true }
1212
diesel-async = { workspace = true }
1313
diesel_full_text_search = { workspace = true }
14-
diesel_migrations = "2.1.0"
14+
diesel_migrations = "2.2.0"
1515
futures-util = { version = "0.3.30", default-features = false, features = [
1616
"alloc",
1717
] }
@@ -32,7 +32,7 @@ rustls-native-certs = "0.7.0"
3232
serde = { version = "1.0.203", features = ["derive"] }
3333
sonic-rs = { workspace = true }
3434
speedy-uuid = { workspace = true, features = ["diesel"] }
35-
tokio = { version = "1.37.0", features = ["rt"] }
35+
tokio = { version = "1.38.0", features = ["rt"] }
3636
tokio-postgres = "0.7.10"
3737
tokio-postgres-rustls = "0.12.0"
3838
tracing = "0.1.40"
@@ -42,7 +42,7 @@ typed-builder = "0.18.2"
4242

4343
[dev-dependencies]
4444
kitsune-test = { workspace = true }
45-
tokio = { version = "1.37.0", features = ["macros"] }
45+
tokio = { version = "1.38.0", features = ["macros"] }
4646

4747
[lints]
4848
workspace = true

‎crates/kitsune-db/src/function.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
use crate::schema::sql_types::LanguageIsoCode;
22
use diesel::{
3-
sql_function,
3+
define_sql_function,
44
sql_types::{Nullable, Text},
55
};
66
use diesel_full_text_search::RegConfig;
77

8-
sql_function! {
8+
define_sql_function! {
99
/// Coalesce between two nullable text fields, where one of those should have a value
1010
#[sql_name = "COALESCE"]
1111
fn coalesce_nullable(x: Nullable<Text>, y: Nullable<Text>) -> Text;
1212
}
1313

14-
sql_function! {
14+
define_sql_function! {
1515
/// Get the optimal regconfig for the ISO code with the current database configuration
1616
fn iso_code_to_language(iso_code: LanguageIsoCode) -> RegConfig;
1717
}
1818

19-
sql_function! {
19+
define_sql_function! {
2020
/// Return the current date with the timezone
2121
fn now() -> Timestamptz;
2222
}

‎crates/kitsune-http-client/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ http-body = "1.0.0"
1515
http-body-util = "0.1.1"
1616
http-signatures = { workspace = true }
1717
hyper = "1.3.1"
18-
hyper-util = { version = "0.1.4", features = [
18+
hyper-util = { version = "0.1.5", features = [
1919
"client-legacy",
2020
"http1",
2121
"http2",
2222
"tokio",
2323
] }
24-
hyper-rustls = { version = "0.27.1", default-features = false, features = [
24+
hyper-rustls = { version = "0.27.2", default-features = false, features = [
2525
"http1",
2626
"http2",
2727
"logging",
@@ -48,7 +48,7 @@ tower-http = { version = "0.5.2", features = [
4848
] }
4949

5050
[dev-dependencies]
51-
tokio = { version = "1.37.0", features = ["macros", "rt"] }
51+
tokio = { version = "1.38.0", features = ["macros", "rt"] }
5252

5353
[lints]
5454
workspace = true

‎crates/kitsune-language/src/regconfig.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
use crate::supported_languages;
2-
use diesel::{deserialize, pg::Pg, row::NamedRow, QueryableByName};
2+
use diesel::{deserialize, pg::Pg, row::NamedRow, sql_types, QueryableByName};
33
use diesel_async::{AsyncConnection, RunQueryDsl};
4-
use std::collections::HashSet;
5-
use std::fmt::Write;
4+
use std::{collections::HashSet, fmt::Write};
65

76
#[derive(Debug)]
87
struct PgCatalogResult {
@@ -12,7 +11,7 @@ struct PgCatalogResult {
1211
impl QueryableByName<Pg> for PgCatalogResult {
1312
fn build<'a>(row: &impl NamedRow<'a, Pg>) -> deserialize::Result<Self> {
1413
Ok(Self {
15-
cfgname: NamedRow::get(row, "cfgname")?,
14+
cfgname: NamedRow::get::<sql_types::Text, _>(row, "cfgname")?,
1615
})
1716
}
1817
}

‎crates/kitsune-observability/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ opentelemetry_sdk = { version = "0.23.0", default-features = false, features = [
2929
] }
3030
tracing = "0.1.40"
3131
tracing-error = "0.2.0"
32-
tracing-opentelemetry = { version = "0.23.0", default-features = false }
32+
tracing-opentelemetry = { version = "0.24.0", default-features = false }
3333
tracing-subscriber = "0.3.18"
3434

3535
[lints]

‎crates/kitsune-s3/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ typed-builder = "0.18.2"
1818

1919
[dev-dependencies]
2020
kitsune-test = { workspace = true }
21-
tokio = { version = "1.37.0", features = ["macros", "rt"] }
21+
tokio = { version = "1.38.0", features = ["macros", "rt"] }
2222

2323
[lints]
2424
workspace = true

‎crates/kitsune-service/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ rusty-s3 = { version = "0.5.0", default-features = false }
4848
serde = "1.0.203"
4949
smol_str = "0.2.2"
5050
speedy-uuid = { workspace = true }
51-
tokio = { version = "1.37.0", features = ["macros", "sync"] }
51+
tokio = { version = "1.38.0", features = ["macros", "sync"] }
5252
tracing = "0.1.40"
5353
triomphe = { workspace = true }
5454
typed-builder = "0.18.2"

‎crates/kitsune-storage/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ futures-util = "0.3.30"
1212
kitsune-error = { workspace = true }
1313
kitsune-s3 = { workspace = true }
1414
rusty-s3 = { version = "0.5.0", default-features = false }
15-
tokio = { version = "1.37.0", features = ["fs", "io-util"] }
15+
tokio = { version = "1.38.0", features = ["fs", "io-util"] }
1616
tokio-util = { version = "0.7.11", features = ["io"] }
1717
triomphe = { workspace = true }
1818

1919
[dev-dependencies]
2020
tempfile = "3.10.1"
21-
tokio = { version = "1.37.0", features = ["macros", "rt"] }
21+
tokio = { version = "1.38.0", features = ["macros", "rt"] }
2222

2323
[lints]
2424
workspace = true

‎crates/kitsune-test/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ kitsune-s3 = { workspace = true }
1919
pin-project-lite = "0.2.14"
2020
rand = "0.8.5"
2121
rusty-s3 = { version = "0.5.0", default-features = false }
22-
tokio = { version = "1.37.0", features = ["time"] }
22+
tokio = { version = "1.38.0", features = ["time"] }
2323
triomphe = { workspace = true }
2424
url = "2.5.0"
2525
uuid = { version = "1.8.0", features = ["fast-rng", "v4"] }

‎crates/kitsune-util/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pulldown-cmark = { version = "0.11.0", default-features = false, features = [
1616
] }
1717
rand = "0.8.5"
1818
speedy-uuid = { workspace = true }
19-
tokio = { version = "1.37.0", features = ["macros"] }
19+
tokio = { version = "1.38.0", features = ["macros"] }
2020

2121
[lints]
2222
workspace = true

‎crates/kitsune-wasm-mrf/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ redb = { version = "2.1.0", features = ["logging"] }
2525
slab = "0.4.9"
2626
smol_str = "0.2.2"
2727
sonic-rs = { workspace = true }
28-
tokio = { version = "1.37.0", features = ["fs"] }
28+
tokio = { version = "1.38.0", features = ["fs"] }
2929
tracing = "0.1.40"
3030
triomphe = { workspace = true }
3131
walkdir = "2.5.0"
@@ -42,9 +42,9 @@ wasmtime-wasi = { version = "21.0.1", default-features = false }
4242

4343
[dev-dependencies]
4444
tempfile = "3.10.1"
45-
tokio = { version = "1.37.0", features = ["macros", "rt"] }
45+
tokio = { version = "1.38.0", features = ["macros", "rt"] }
4646
tracing-subscriber = "0.3.18"
47-
wat = "1.208.1"
47+
wat = "1.209.1"
4848

4949
[lints]
5050
workspace = true

‎crates/kitsune-wasm-mrf/example-mrf/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
1111

1212
[dependencies]
1313
rand = "0.8.5"
14-
wit-bindgen = "0.25.0"
14+
wit-bindgen = "0.26.0"
1515

1616
[lints]
1717
workspace = true

‎crates/kitsune-webfinger/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ http-body-util = "0.1.1"
2525
hyper = "1.3.1"
2626
pretty_assertions = "1.4.0"
2727
sonic-rs = { workspace = true }
28-
tokio = { version = "1.37.0", features = ["macros"] }
28+
tokio = { version = "1.38.0", features = ["macros"] }
2929
tower = { version = "0.4.13", default-features = false, features = ["util"] }
3030

3131
[lints]

0 commit comments

Comments
 (0)