Skip to content

Commit

Permalink
Update dependencies and sonic-rs commit (#544)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
aumetra authored Jun 1, 2024
1 parent 8ff4d08 commit 3f3f735
Show file tree
Hide file tree
Showing 30 changed files with 188 additions and 336 deletions.
188 changes: 89 additions & 99 deletions Cargo.lock

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ askama = { version = "0.12.1", default-features = false, features = [
"with-axum",
] }
clap = { version = "4.5.4", features = ["derive", "wrap_help"] }
diesel = { version = "2.1.6", default-features = false, features = [
diesel = { version = "2.2.0", default-features = false, features = [
"32-column-tables",
"with-deprecated",
] }
Expand All @@ -89,7 +89,7 @@ diesel-async = { version = "0.4.1", features = [
"postgres",
"tokio",
] }
diesel_full_text_search = { version = "2.1.1", default-features = false }
diesel_full_text_search = { version = "2.2.0", default-features = false }
fred = { version = "9.0.3", features = [
"enable-rustls-ring",
"full-tracing",
Expand All @@ -107,7 +107,7 @@ itertools = { version = "0.13.0", default-features = false }
moka = { version = "0.12.7", features = ["sync"] }
simdutf8 = { version = "0.1.4", features = ["aarch64_neon"] }
sonic-rs = "0.3.6"
triomphe = { version = "0.1.11", default-features = false, features = [
triomphe = { version = "0.1.12", default-features = false, features = [
"unsize",
] }

Expand Down Expand Up @@ -208,12 +208,12 @@ pr-run-mode = "plan"
install-updater = true

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

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

# TCP nodelay for `axum::serve`
axum = { git = "https://github.com/tokio-rs/axum.git", rev = "8d0c5c05eb75eb779591c8000705e785123868a0" }
Expand All @@ -225,4 +225,4 @@ opentelemetry-http = { git = "https://github.com/open-telemetry/opentelemetry-ru
opentelemetry-otlp = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "40fb924215c84d6e3818351b2c0e3d2ba01a7db9" }
opentelemetry_sdk = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "40fb924215c84d6e3818351b2c0e3d2ba01a7db9" }
tonic = { git = "https://github.com/hyperium/tonic.git", rev = "a90adf27ef389a9c9d891c3f5696e6245589c479" }
tracing-opentelemetry = { git = "https://github.com/aumetra/tracing-opentelemetry.git", rev = "e6e16057f6e3b2a11f6f8e7c86a1c17e4f7a07f1" }
tracing-opentelemetry = { git = "https://github.com/aumetra/tracing-opentelemetry.git", rev = "b7fe8d5d056e43f913a85eac1e6a661226b49c43" }
2 changes: 1 addition & 1 deletion crates/kitsune-activitypub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ kitsune-config = { workspace = true }
kitsune-test = { workspace = true }
kitsune-webfinger = { workspace = true }
pretty_assertions = "1.4.0"
tokio = { version = "1.37.0", features = ["macros"] }
tokio = { version = "1.38.0", features = ["macros"] }
tower = { version = "0.4.13", default-features = false, features = ["util"] }

[lints]
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 @@ -17,7 +17,7 @@ triomphe = { workspace = true }
typed-builder = "0.18.2"

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

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/kitsune-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ human-size = { version = "0.4.3", features = ["serde"] }
isolang = { version = "2.4.0", features = ["serde"] }
serde = { version = "1.0.203", features = ["derive"] }
smol_str = { version = "0.2.2", features = ["serde"] }
tokio = { version = "1.37.0", features = ["fs"] }
tokio = { version = "1.38.0", features = ["fs"] }
toml = { version = "0.8.13", default-features = false, features = ["parse"] }

[lints]
Expand Down
6 changes: 3 additions & 3 deletions crates/kitsune-db/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ blowocking = { workspace = true, features = ["io"] }
diesel = { workspace = true }
diesel-async = { workspace = true }
diesel_full_text_search = { workspace = true }
diesel_migrations = "2.1.0"
diesel_migrations = "2.2.0"
futures-util = { version = "0.3.30", default-features = false, features = [
"alloc",
] }
Expand All @@ -32,7 +32,7 @@ rustls-native-certs = "0.7.0"
serde = { version = "1.0.203", features = ["derive"] }
sonic-rs = { workspace = true }
speedy-uuid = { workspace = true, features = ["diesel"] }
tokio = { version = "1.37.0", features = ["rt"] }
tokio = { version = "1.38.0", features = ["rt"] }
tokio-postgres = "0.7.10"
tokio-postgres-rustls = "0.12.0"
tracing = "0.1.40"
Expand All @@ -42,7 +42,7 @@ typed-builder = "0.18.2"

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

[lints]
workspace = true
8 changes: 4 additions & 4 deletions crates/kitsune-db/src/function.rs
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
use crate::schema::sql_types::LanguageIsoCode;
use diesel::{
sql_function,
define_sql_function,
sql_types::{Nullable, Text},
};
use diesel_full_text_search::RegConfig;

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

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

sql_function! {
define_sql_function! {
/// Return the current date with the timezone
fn now() -> Timestamptz;
}
6 changes: 3 additions & 3 deletions crates/kitsune-http-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ http-body = "1.0.0"
http-body-util = "0.1.1"
http-signatures = { workspace = true }
hyper = "1.3.1"
hyper-util = { version = "0.1.4", features = [
hyper-util = { version = "0.1.5", features = [
"client-legacy",
"http1",
"http2",
"tokio",
] }
hyper-rustls = { version = "0.27.1", default-features = false, features = [
hyper-rustls = { version = "0.27.2", default-features = false, features = [
"http1",
"http2",
"logging",
Expand All @@ -48,7 +48,7 @@ tower-http = { version = "0.5.2", features = [
] }

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

[lints]
workspace = true
7 changes: 3 additions & 4 deletions crates/kitsune-language/src/regconfig.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
use crate::supported_languages;
use diesel::{deserialize, pg::Pg, row::NamedRow, QueryableByName};
use diesel::{deserialize, pg::Pg, row::NamedRow, sql_types, QueryableByName};
use diesel_async::{AsyncConnection, RunQueryDsl};
use std::collections::HashSet;
use std::fmt::Write;
use std::{collections::HashSet, fmt::Write};

#[derive(Debug)]
struct PgCatalogResult {
Expand All @@ -12,7 +11,7 @@ struct PgCatalogResult {
impl QueryableByName<Pg> for PgCatalogResult {
fn build<'a>(row: &impl NamedRow<'a, Pg>) -> deserialize::Result<Self> {
Ok(Self {
cfgname: NamedRow::get(row, "cfgname")?,
cfgname: NamedRow::get::<sql_types::Text, _>(row, "cfgname")?,
})
}
}
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-observability/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ opentelemetry_sdk = { version = "0.23.0", default-features = false, features = [
] }
tracing = "0.1.40"
tracing-error = "0.2.0"
tracing-opentelemetry = { version = "0.23.0", default-features = false }
tracing-opentelemetry = { version = "0.24.0", default-features = false }
tracing-subscriber = "0.3.18"

[lints]
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-s3/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ typed-builder = "0.18.2"

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

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/kitsune-service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ rusty-s3 = { version = "0.5.0", default-features = false }
serde = "1.0.203"
smol_str = "0.2.2"
speedy-uuid = { workspace = true }
tokio = { version = "1.37.0", features = ["macros", "sync"] }
tokio = { version = "1.38.0", features = ["macros", "sync"] }
tracing = "0.1.40"
triomphe = { workspace = true }
typed-builder = "0.18.2"
Expand Down
4 changes: 2 additions & 2 deletions crates/kitsune-storage/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ futures-util = "0.3.30"
kitsune-error = { workspace = true }
kitsune-s3 = { workspace = true }
rusty-s3 = { version = "0.5.0", default-features = false }
tokio = { version = "1.37.0", features = ["fs", "io-util"] }
tokio = { version = "1.38.0", features = ["fs", "io-util"] }
tokio-util = { version = "0.7.11", features = ["io"] }
triomphe = { workspace = true }

[dev-dependencies]
tempfile = "3.10.1"
tokio = { version = "1.37.0", features = ["macros", "rt"] }
tokio = { version = "1.38.0", features = ["macros", "rt"] }

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/kitsune-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ kitsune-s3 = { workspace = true }
pin-project-lite = "0.2.14"
rand = "0.8.5"
rusty-s3 = { version = "0.5.0", default-features = false }
tokio = { version = "1.37.0", features = ["time"] }
tokio = { version = "1.38.0", features = ["time"] }
triomphe = { workspace = true }
url = "2.5.0"
uuid = { version = "1.8.0", features = ["fast-rng", "v4"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pulldown-cmark = { version = "0.11.0", default-features = false, features = [
] }
rand = "0.8.5"
speedy-uuid = { workspace = true }
tokio = { version = "1.37.0", features = ["macros"] }
tokio = { version = "1.38.0", features = ["macros"] }

[lints]
workspace = true
6 changes: 3 additions & 3 deletions crates/kitsune-wasm-mrf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ redb = { version = "2.1.0", features = ["logging"] }
slab = "0.4.9"
smol_str = "0.2.2"
sonic-rs = { workspace = true }
tokio = { version = "1.37.0", features = ["fs"] }
tokio = { version = "1.38.0", features = ["fs"] }
tracing = "0.1.40"
triomphe = { workspace = true }
walkdir = "2.5.0"
Expand All @@ -42,9 +42,9 @@ wasmtime-wasi = { version = "21.0.1", default-features = false }

[dev-dependencies]
tempfile = "3.10.1"
tokio = { version = "1.37.0", features = ["macros", "rt"] }
tokio = { version = "1.38.0", features = ["macros", "rt"] }
tracing-subscriber = "0.3.18"
wat = "1.208.1"
wat = "1.209.1"

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/kitsune-wasm-mrf/example-mrf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ crate-type = ["cdylib"]

[dependencies]
rand = "0.8.5"
wit-bindgen = "0.25.0"
wit-bindgen = "0.26.0"

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/kitsune-webfinger/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ http-body-util = "0.1.1"
hyper = "1.3.1"
pretty_assertions = "1.4.0"
sonic-rs = { workspace = true }
tokio = { version = "1.37.0", features = ["macros"] }
tokio = { version = "1.38.0", features = ["macros"] }
tower = { version = "0.4.13", default-features = false, features = ["util"] }

[lints]
Expand Down
Loading

0 comments on commit 3f3f735

Please sign in to comment.