Merge branch 'bump-rust-nix' into 'next'

chore: bump rust & nix

See merge request famedly/conduit!668

.gitlab-ci.yml

@@ -54,7 +54,7 @@ before_script:
 
 ci:
   stage: ci
-  image: nixos/nix:2.20.4
+  image: nixos/nix:2.22.0
   script:
     # Cache the inputs required for the devShell
     - ./bin/nix-build-and-cache .#devShells.x86_64-linux.default.inputDerivation
@@ -79,7 +79,7 @@ ci:
 
 artifacts:
   stage: artifacts
-  image: nixos/nix:2.20.4
+  image: nixos/nix:2.22.0
   script:
     - ./bin/nix-build-and-cache .#static-x86_64-unknown-linux-musl
     - cp result/bin/conduit x86_64-unknown-linux-musl

Cargo.toml

@@ -21,7 +21,7 @@ version = "0.8.0-alpha"
 edition = "2021"
 
 # See also `rust-toolchain.toml`
-rust-version = "1.75.0"
+rust-version = "1.78.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

complement/Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.75.0
+FROM rust:1.78.0
 
 WORKDIR /workdir
 

flake.nix

@@ -59,7 +59,7 @@
             file = ./rust-toolchain.toml;
 
             # See also `rust-toolchain.toml`
-            sha256 = "sha256-SXRtAuO4IqNOQq+nLbrsDFbVk+3aVA8NNpSZsKlVH/8=";
+            sha256 = "sha256-opUgs6ckUQCyDxcB9Wy51pqhd0MPGHUVbwRKKPGiwZU=";
           };
       });
     in

rust-toolchain.toml

@@ -10,7 +10,7 @@
 # If you're having trouble making the relevant changes, bug a maintainer.
 
 [toolchain]
-channel = "1.75.0"
+channel = "1.78.0"
 components = [
     # For rust-analyzer
     "rust-src",

src/api/appservice_server.rs

@@ -10,12 +10,12 @@ use tracing::warn;
 ///
 /// Only returns None if there is no url specified in the appservice registration file
 #[tracing::instrument(skip(request))]
-pub(crate) async fn send_request<T: OutgoingRequest>(
+pub(crate) async fn send_request<T>(
     registration: Registration,
     request: T,
 ) -> Result<Option<T::IncomingResponse>>
 where
-    T: Debug,
+    T: OutgoingRequest + Debug,
 {
     let destination = match registration.url {
         Some(url) => url,

src/api/client_server/device.rs

@@ -53,7 +53,7 @@ pub async fn update_device_route(
         .get_device_metadata(sender_user, &body.device_id)?
         .ok_or(Error::BadRequest(ErrorKind::NotFound, "Device not found."))?;
 
-    device.display_name = body.display_name.clone();
+    device.display_name.clone_from(&body.display_name);
 
     services()
         .users

src/api/client_server/membership.rs

@@ -213,7 +213,7 @@ pub async fn kick_user_route(
     .map_err(|_| Error::bad_database("Invalid member event in database."))?;
 
     event.membership = MembershipState::Leave;
-    event.reason = body.reason.clone();
+    event.reason.clone_from(&body.reason);
 
     let mutex_state = Arc::clone(
         services()
@@ -364,7 +364,7 @@ pub async fn unban_user_route(
     .map_err(|_| Error::bad_database("Invalid member event in database."))?;
 
     event.membership = MembershipState::Leave;
-    event.reason = body.reason.clone();
+    event.reason.clone_from(&body.reason);
 
     let mutex_state = Arc::clone(
         services()

src/api/ruma_wrapper/axum.rs

@@ -286,7 +286,7 @@ where
                 }
             };
 
-        let mut http_request = http::Request::builder().uri(parts.uri).method(parts.method);
+        let mut http_request = Request::builder().uri(parts.uri).method(parts.method);
         *http_request.headers_mut().unwrap() = parts.headers;
 
         if let Some(CanonicalJsonValue::Object(json_body)) = &mut json_body {

src/api/server_server.rs

@@ -116,12 +116,12 @@ impl FedDest {
 }
 
 #[tracing::instrument(skip(request))]
-pub(crate) async fn send_request<T: OutgoingRequest>(
+pub(crate) async fn send_request<T>(
     destination: &ServerName,
     request: T,
 ) -> Result<T::IncomingResponse>
 where
-    T: Debug,
+    T: OutgoingRequest + Debug,
 {
     if !services().globals.allow_federation() {
         return Err(Error::bad_config("Federation is disabled."));

src/database/abstraction.rs

@@ -38,7 +38,6 @@ pub trait KeyValueDatabaseEngine: Send + Sync {
     fn memory_usage(&self) -> Result<String> {
         Ok("Current database engine does not support memory usage reporting.".to_owned())
     }
-    fn clear_caches(&self) {}
 }
 
 pub trait KvTree: Send + Sync {

src/database/abstraction/rocksdb.rs

@@ -126,8 +126,6 @@ impl KeyValueDatabaseEngine for Arc<Engine> {
             self.cache.get_pinned_usage() as f64 / 1024.0 / 1024.0,
         ))
     }
-
-    fn clear_caches(&self) {}
 }
 
 impl RocksDbEngineTree<'_> {

src/database/abstraction/sqlite.rs

@@ -13,8 +13,8 @@ use thread_local::ThreadLocal;
 use tracing::debug;
 
 thread_local! {
-    static READ_CONNECTION: RefCell<Option<&'static Connection>> = RefCell::new(None);
-    static READ_CONNECTION_ITERATOR: RefCell<Option<&'static Connection>> = RefCell::new(None);
+    static READ_CONNECTION: RefCell<Option<&'static Connection>> = const { RefCell::new(None) };
+    static READ_CONNECTION_ITERATOR: RefCell<Option<&'static Connection>> = const { RefCell::new(None) };
 }
 
 struct PreparedStatementIterator<'a> {

src/database/abstraction/watchers.rs

@@ -20,7 +20,7 @@ impl Watchers {
         let mut rx = match self.watchers.write().unwrap().entry(prefix.to_vec()) {
             hash_map::Entry::Occupied(o) => o.get().1.clone(),
             hash_map::Entry::Vacant(v) => {
-                let (tx, rx) = tokio::sync::watch::channel(());
+                let (tx, rx) = watch::channel(());
                 v.insert((tx, rx.clone()));
                 rx
             }

src/database/mod.rs

@@ -237,7 +237,7 @@ impl KeyValueDatabase {
         Self::check_db_setup(&config)?;
 
         if !Path::new(&config.database_path).exists() {
-            std::fs::create_dir_all(&config.database_path)
+            fs::create_dir_all(&config.database_path)
                 .map_err(|_| Error::BadConfig("Database folder doesn't exists and couldn't be created (e.g. due to missing permissions). Please create the database folder yourself."))?;
         }
 
@@ -846,7 +846,7 @@ impl KeyValueDatabase {
                         let rule = rules_list.content.get(content_rule_transformation[0]);
                         if rule.is_some() {
                             let mut rule = rule.unwrap().clone();
-                            rule.rule_id = content_rule_transformation[1].to_owned();
+                            content_rule_transformation[1].clone_into(&mut rule.rule_id);
                             rules_list
                                 .content
                                 .shift_remove(content_rule_transformation[0]);
@@ -871,7 +871,7 @@ impl KeyValueDatabase {
                             let rule = rules_list.underride.get(transformation[0]);
                             if let Some(rule) = rule {
                                 let mut rule = rule.clone();
-                                rule.rule_id = transformation[1].to_owned();
+                                transformation[1].clone_into(&mut rule.rule_id);
                                 rules_list.underride.shift_remove(transformation[0]);
                                 rules_list.underride.insert(rule);
                             }
@@ -918,7 +918,7 @@ impl KeyValueDatabase {
                     let mut account_data =
                         serde_json::from_str::<PushRulesEvent>(raw_rules_list.get()).unwrap();
 
-                    let user_default_rules = ruma::push::Ruleset::server_default(&user);
+                    let user_default_rules = Ruleset::server_default(&user);
                     account_data
                         .content
                         .global

src/main.rs

@@ -217,7 +217,7 @@ async fn run_server() -> io::Result<()> {
 }
 
 async fn spawn_task<B: Send + 'static>(
-    req: axum::http::Request<B>,
+    req: http::Request<B>,
     next: axum::middleware::Next<B>,
 ) -> std::result::Result<axum::response::Response, StatusCode> {
     if services().globals.shutdown.load(atomic::Ordering::Relaxed) {
@@ -229,13 +229,13 @@ async fn spawn_task<B: Send + 'static>(
 }
 
 async fn unrecognized_method<B: Send>(
-    req: axum::http::Request<B>,
+    req: http::Request<B>,
     next: axum::middleware::Next<B>,
 ) -> std::result::Result<axum::response::Response, StatusCode> {
     let method = req.method().clone();
     let uri = req.uri().clone();
     let inner = next.run(req).await;
-    if inner.status() == axum::http::StatusCode::METHOD_NOT_ALLOWED {
+    if inner.status() == StatusCode::METHOD_NOT_ALLOWED {
         warn!("Method not allowed: {method} {uri}");
         return Ok(RumaResponse(UiaaResponse::MatrixError(RumaError {
             body: ErrorBody::Standard {

src/service/globals/mod.rs

@@ -80,12 +80,12 @@ pub struct Service {
 /// Handles "rotation" of long-polling requests. "Rotation" in this context is similar to "rotation" of log files and the like.
 ///
 /// This is utilized to have sync workers return early and release read locks on the database.
-pub struct RotationHandler(broadcast::Sender<()>, broadcast::Receiver<()>);
+pub struct RotationHandler(broadcast::Sender<()>);
 
 impl RotationHandler {
     pub fn new() -> Self {
-        let (s, r) = broadcast::channel(1);
-        Self(s, r)
+        let s = broadcast::channel(1).0;
+        Self(s)
     }
 
     pub fn watch(&self) -> impl Future<Output = ()> {

src/service/pusher/mod.rs

@@ -44,13 +44,13 @@ impl Service {
     }
 
     #[tracing::instrument(skip(self, destination, request))]
-    pub async fn send_request<T: OutgoingRequest>(
+    pub async fn send_request<T>(
         &self,
         destination: &str,
         request: T,
     ) -> Result<T::IncomingResponse>
     where
-        T: Debug,
+        T: OutgoingRequest + Debug,
     {
         let destination = destination.replace("/_matrix/push/v1/notify", "");
 
@@ -231,11 +231,11 @@ impl Service {
 
                 let mut device = Device::new(pusher.ids.app_id.clone(), pusher.ids.pushkey.clone());
                 device.data.default_payload = http.default_payload.clone();
-                device.data.format = http.format.clone();
+                device.data.format.clone_from(&http.format);
 
                 // Tweaks are only added if the format is NOT event_id_only
                 if !event_id_only {
-                    device.tweaks = tweaks.clone();
+                    device.tweaks.clone_from(&tweaks);
                 }
 
                 let d = vec![device];

src/service/rooms/spaces/mod.rs

@@ -482,7 +482,7 @@ impl Service {
         match join_rule {
             JoinRule::Restricted(r) => {
                 for rule in &r.allow {
-                    if let join_rules::AllowRule::RoomMembership(rm) = rule {
+                    if let AllowRule::RoomMembership(rm) = rule {
                         if let Ok(true) = services()
                             .rooms
                             .state_cache

src/service/sending/mod.rs

@@ -675,13 +675,13 @@ impl Service {
     }
 
     #[tracing::instrument(skip(self, destination, request))]
-    pub async fn send_federation_request<T: OutgoingRequest>(
+    pub async fn send_federation_request<T>(
         &self,
         destination: &ServerName,
         request: T,
     ) -> Result<T::IncomingResponse>
     where
-        T: Debug,
+        T: OutgoingRequest + Debug,
     {
         debug!("Waiting for permit");
         let permit = self.maximum_requests.acquire().await;
@@ -704,13 +704,13 @@ impl Service {
     ///
     /// Only returns None if there is no url specified in the appservice registration file
     #[tracing::instrument(skip(self, registration, request))]
-    pub async fn send_appservice_request<T: OutgoingRequest>(
+    pub async fn send_appservice_request<T>(
         &self,
         registration: Registration,
         request: T,
     ) -> Result<Option<T::IncomingResponse>>
     where
-        T: Debug,
+        T: OutgoingRequest + Debug,
     {
         let permit = self.maximum_requests.acquire().await;
         let response = appservice_server::send_request(registration, request).await;

src/service/users/mod.rs

@@ -86,11 +86,12 @@ impl Service {
         for (list_id, list) in &mut request.lists {
             if let Some(cached_list) = cached.lists.get(list_id) {
                 if list.sort.is_empty() {
-                    list.sort = cached_list.sort.clone();
+                    list.sort.clone_from(&cached_list.sort);
                 };
                 if list.room_details.required_state.is_empty() {
-                    list.room_details.required_state =
-                        cached_list.room_details.required_state.clone();
+                    list.room_details
+                        .required_state
+                        .clone_from(&cached_list.room_details.required_state);
                 };
                 list.room_details.timeline_limit = list
                     .room_details
@@ -132,7 +133,8 @@ impl Service {
                     (_, _) => {}
                 }
                 if list.bump_event_types.is_empty() {
-                    list.bump_event_types = cached_list.bump_event_types.clone();
+                    list.bump_event_types
+                        .clone_from(&cached_list.bump_event_types);
                 };
             }
             cached.lists.insert(list_id.clone(), list.clone());

src/utils/mod.rs

@@ -122,16 +122,14 @@ pub fn deserialize_from_str<
     'de,
     D: serde::de::Deserializer<'de>,
     T: FromStr<Err = E>,
-    E: std::fmt::Display,
+    E: fmt::Display,
 >(
     deserializer: D,
 ) -> Result<T, D::Error> {
     struct Visitor<T: FromStr<Err = E>, E>(std::marker::PhantomData<T>);
-    impl<'de, T: FromStr<Err = Err>, Err: std::fmt::Display> serde::de::Visitor<'de>
-        for Visitor<T, Err>
-    {
+    impl<'de, T: FromStr<Err = Err>, Err: fmt::Display> serde::de::Visitor<'de> for Visitor<T, Err> {
         type Value = T;
-        fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
             write!(formatter, "a parsable string")
         }
         fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>