Compare commits

...

2 commits

Author SHA1 Message Date
Jade Ellis
a78ef05b43
chore: Upgrade ctor, cbor 2025-08-31 03:01:06 +01:00
Jade Ellis
fac08a4173
chore(deps): Upgrade minor incompatible dependencies 2025-08-31 01:55:12 +01:00
15 changed files with 528 additions and 381 deletions

862
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -48,15 +48,15 @@ features = ["ffi", "std", "union"]
version = "0.6.2" version = "0.6.2"
[workspace.dependencies.ctor] [workspace.dependencies.ctor]
version = "0.2.9" version = "0.5.0"
[workspace.dependencies.cargo_toml] [workspace.dependencies.cargo_toml]
version = "0.21" version = "0.22"
default-features = false default-features = false
features = ["features"] features = ["features"]
[workspace.dependencies.toml] [workspace.dependencies.toml]
version = "0.8.14" version = "0.9.5"
default-features = false default-features = false
features = ["parse"] features = ["parse"]
@ -411,25 +411,25 @@ default-features = false
# optional opentelemetry, performance measurements, flamegraphs, etc for performance measurements and monitoring # optional opentelemetry, performance measurements, flamegraphs, etc for performance measurements and monitoring
[workspace.dependencies.opentelemetry] [workspace.dependencies.opentelemetry]
version = "0.21.0" version = "0.30.0"
[workspace.dependencies.tracing-flame] [workspace.dependencies.tracing-flame]
version = "0.2.0" version = "0.2.0"
[workspace.dependencies.tracing-opentelemetry] [workspace.dependencies.tracing-opentelemetry]
version = "0.22.0" version = "0.31.0"
[workspace.dependencies.opentelemetry_sdk] [workspace.dependencies.opentelemetry_sdk]
version = "0.21.2" version = "0.30.0"
features = ["rt-tokio"] features = ["rt-tokio"]
[workspace.dependencies.opentelemetry-jaeger] [workspace.dependencies.opentelemetry-jaeger]
version = "0.20.0" version = "0.22.0"
features = ["rt-tokio"] features = ["rt-tokio"]
# optional sentry metrics for crash/panic reporting # optional sentry metrics for crash/panic reporting
[workspace.dependencies.sentry] [workspace.dependencies.sentry]
version = "0.37.0" version = "0.42.0"
default-features = false default-features = false
features = [ features = [
"backtrace", "backtrace",
@ -445,9 +445,9 @@ features = [
] ]
[workspace.dependencies.sentry-tracing] [workspace.dependencies.sentry-tracing]
version = "0.37.0" version = "0.42.0"
[workspace.dependencies.sentry-tower] [workspace.dependencies.sentry-tower]
version = "0.37.0" version = "0.42.0"
# jemalloc usage # jemalloc usage
[workspace.dependencies.tikv-jemalloc-sys] [workspace.dependencies.tikv-jemalloc-sys]
@ -476,7 +476,7 @@ features = ["use_std"]
version = "0.4" version = "0.4"
[workspace.dependencies.nix] [workspace.dependencies.nix]
version = "0.29.0" version = "0.30.1"
default-features = false default-features = false
features = ["resource"] features = ["resource"]
@ -498,7 +498,7 @@ version = "0.4.3"
default-features = false default-features = false
[workspace.dependencies.termimad] [workspace.dependencies.termimad]
version = "0.31.2" version = "0.34.0"
default-features = false default-features = false
[workspace.dependencies.checked_ops] [workspace.dependencies.checked_ops]
@ -536,11 +536,11 @@ version = "0.2"
version = "0.2" version = "0.2"
[workspace.dependencies.minicbor] [workspace.dependencies.minicbor]
version = "0.26.3" version = "2.1.1"
features = ["std"] features = ["std"]
[workspace.dependencies.minicbor-serde] [workspace.dependencies.minicbor-serde]
version = "0.4.1" version = "0.6.0"
features = ["std"] features = ["std"]
[workspace.dependencies.maplit] [workspace.dependencies.maplit]

View file

@ -89,6 +89,7 @@ serde_yaml.workspace = true
tokio.workspace = true tokio.workspace = true
tracing-subscriber.workspace = true tracing-subscriber.workspace = true
tracing.workspace = true tracing.workspace = true
ctor.workspace = true
[lints] [lints]
workspace = true workspace = true

View file

@ -29,6 +29,8 @@ pub(crate) use crate::{context::Context, utils::get_room_info};
pub(crate) const PAGE_SIZE: usize = 100; pub(crate) const PAGE_SIZE: usize = 100;
use ctor::{ctor, dtor};
conduwuit::mod_ctor! {} conduwuit::mod_ctor! {}
conduwuit::mod_dtor! {} conduwuit::mod_dtor! {}
conduwuit::rustc_flags_capture! {} conduwuit::rustc_flags_capture! {}

View file

@ -93,6 +93,7 @@ serde.workspace = true
sha1.workspace = true sha1.workspace = true
tokio.workspace = true tokio.workspace = true
tracing.workspace = true tracing.workspace = true
ctor.workspace = true
[lints] [lints]
workspace = true workspace = true

View file

@ -321,7 +321,7 @@ pub(crate) fn event_filter(item: PdusIterItem, filter: &RoomEventFilter) -> Opti
filter.matches(pdu).then_some(item) filter.matches(pdu).then_some(item)
} }
#[cfg_attr(debug_assertions, conduwuit::ctor)] #[cfg_attr(debug_assertions, ctor::ctor)]
fn _is_sorted() { fn _is_sorted() {
debug_assert!( debug_assert!(
IGNORED_MESSAGE_TYPES.is_sorted(), IGNORED_MESSAGE_TYPES.is_sorted(),

View file

@ -66,6 +66,7 @@ serde.workspace = true
serde_json.workspace = true serde_json.workspace = true
tokio.workspace = true tokio.workspace = true
tracing.workspace = true tracing.workspace = true
ctor.workspace = true
[lints] [lints]
workspace = true workspace = true

View file

@ -3,6 +3,8 @@
extern crate conduwuit_core as conduwuit; extern crate conduwuit_core as conduwuit;
extern crate rust_rocksdb as rocksdb; extern crate rust_rocksdb as rocksdb;
use ctor::{ctor, dtor};
conduwuit::mod_ctor! {} conduwuit::mod_ctor! {}
conduwuit::mod_dtor! {} conduwuit::mod_dtor! {}
conduwuit::rustc_flags_capture! {} conduwuit::rustc_flags_capture! {}

View file

@ -13,13 +13,13 @@ pub(super) fn flags_capture(args: TokenStream) -> TokenStream {
let ret = quote! { let ret = quote! {
pub static RUSTC_FLAGS: [&str; #flag_len] = [#( #flag ),*]; pub static RUSTC_FLAGS: [&str; #flag_len] = [#( #flag ),*];
#[conduwuit_core::ctor] #[ctor]
fn _set_rustc_flags() { fn _set_rustc_flags() {
conduwuit_core::info::rustc::FLAGS.lock().insert(#crate_name, &RUSTC_FLAGS); conduwuit_core::info::rustc::FLAGS.lock().insert(#crate_name, &RUSTC_FLAGS);
} }
// static strings have to be yanked on module unload // static strings have to be yanked on module unload
#[conduwuit_core::dtor] #[dtor]
fn _unset_rustc_flags() { fn _unset_rustc_flags() {
conduwuit_core::info::rustc::FLAGS.lock().remove(#crate_name); conduwuit_core::info::rustc::FLAGS.lock().remove(#crate_name);
} }

View file

@ -202,6 +202,7 @@ clap.workspace = true
console-subscriber.optional = true console-subscriber.optional = true
console-subscriber.workspace = true console-subscriber.workspace = true
const-str.workspace = true const-str.workspace = true
ctor.workspace = true
log.workspace = true log.workspace = true
opentelemetry-jaeger.optional = true opentelemetry-jaeger.optional = true
opentelemetry-jaeger.workspace = true opentelemetry-jaeger.workspace = true

View file

@ -13,6 +13,7 @@ mod sentry;
mod server; mod server;
mod signal; mod signal;
use ctor::{ctor, dtor};
use server::Server; use server::Server;
rustc_flags_capture! {} rustc_flags_capture! {}

View file

@ -125,6 +125,7 @@ tokio.workspace = true
tower.workspace = true tower.workspace = true
tower-http.workspace = true tower-http.workspace = true
tracing.workspace = true tracing.workspace = true
ctor.workspace = true
[target.'cfg(all(unix, target_os = "linux"))'.dependencies] [target.'cfg(all(unix, target_os = "linux"))'.dependencies]
sd-notify.workspace = true sd-notify.workspace = true

View file

@ -12,6 +12,7 @@ use std::{panic::AssertUnwindSafe, pin::Pin, sync::Arc};
use conduwuit::{Error, Result, Server}; use conduwuit::{Error, Result, Server};
use conduwuit_service::Services; use conduwuit_service::Services;
use ctor::{ctor, dtor};
use futures::{Future, FutureExt, TryFutureExt}; use futures::{Future, FutureExt, TryFutureExt};
conduwuit::mod_ctor! {} conduwuit::mod_ctor! {}

View file

@ -117,6 +117,7 @@ webpage.optional = true
blurhash.workspace = true blurhash.workspace = true
blurhash.optional = true blurhash.optional = true
recaptcha-verify = { version = "0.1.5", default-features = false } recaptcha-verify = { version = "0.1.5", default-features = false }
ctor.workspace = true
[lints] [lints]
workspace = true workspace = true

View file

@ -33,6 +33,7 @@ pub mod users;
extern crate conduwuit_core as conduwuit; extern crate conduwuit_core as conduwuit;
extern crate conduwuit_database as database; extern crate conduwuit_database as database;
use ctor::{ctor, dtor};
pub(crate) use service::{Args, Dep, Service}; pub(crate) use service::{Args, Dep, Service};
pub use crate::services::Services; pub use crate::services::Services;