Revert back to Rust stable (#473)

Author: aumetra

Cargo.lock

@@ -7,7 +7,7 @@ version.workspace = true
 [dependencies]
 async-trait = "0.1.77"
 autometrics = { version = "1.0.0", default-features = false }
-base64-simd = { version = "0.8.0", features = ["unstable"] }
+base64-simd = "0.8.0"
 diesel = "2.1.4"
 diesel-async = "0.4.1"
 futures-util = "0.3.30"
@@ -33,7 +33,7 @@ rsa = "0.9.6"
 scoped-futures = "0.1.3"
 serde = "1.0.195"
 sha2 = "0.10.8"
-simd-json = { version = "0.13.7", features = ["hints"] }
+simd-json = "0.13.8"
 speedy-uuid = { path = "../../lib/speedy-uuid" }
 thiserror = "1.0.56"
 tracing = "0.1.40"

crates/kitsune-activitypub/Cargo.toml

@@ -10,7 +10,7 @@ enum_dispatch = "0.3.12"
 moka = { version = "0.12.3", features = ["sync"] }
 redis = "0.24.0"
 serde = "1.0.195"
-simd-json = "0.13.7"
+simd-json = "0.13.8"
 thiserror = "1.0.56"
 tracing = "0.1.40"
 typed-builder = "0.18.1"

crates/kitsune-cache/Cargo.toml

@@ -10,7 +10,7 @@ http = "1.0.0"
 kitsune-http-client = { path = "../kitsune-http-client" }
 serde = { version = "1.0.195", features = ["derive"] }
 serde_urlencoded = "0.7.1"
-simd-json = "0.13.7"
+simd-json = "0.13.8"
 strum = { version = "0.25.0", features = ["derive"] }
 thiserror = "1.0.56"
 typed-builder = "0.18.1"

crates/kitsune-captcha/Cargo.toml

@@ -6,7 +6,7 @@ edition.workspace = true
 build = "build.rs"
 
 [dependencies]
-diesel = { version = "2.1.4", features = ["nightly-error-messages", "uuid"] }
+diesel = { version = "2.1.4", features = ["uuid"] }
 diesel-async = { version = "0.4.1", features = [
     "async-connection-wrapper",
     "deadpool",
@@ -23,7 +23,7 @@ miette = "5.10.0"
 num-derive = "0.4.1"
 num-traits = "0.2.17"
 serde = { version = "1.0.195", features = ["derive"] }
-simd-json = "0.13.7"
+simd-json = "0.13.8"
 speedy-uuid = { path = "../../lib/speedy-uuid", features = ["diesel"] }
 thiserror = "1.0.56"
 tracing-log = "0.2.0"

crates/kitsune-db/Cargo.toml

@@ -25,7 +25,7 @@ kitsune-http-signatures = { path = "../kitsune-http-signatures" }
 kitsune-type = { path = "../kitsune-type" }
 pin-project = "1.1.3"
 serde = "1.0.195"
-simd-json = "0.13.7"
+simd-json = "0.13.8"
 tower = { version = "0.4.13", features = ["util"] }
 tower-http = { version = "0.5.1", features = [
     # Explicitly exclude `zstd`

crates/kitsune-http-client/Cargo.toml

@@ -5,10 +5,11 @@ authors.workspace = true
 edition.workspace = true
 
 [dependencies]
-base64-simd = { version = "0.8.0", features = ["unstable"] }
+base64-simd = "0.8.0"
 derive_builder = "0.12.0"
 http = "1.0.0"
 kitsune-blocking = { path = "../kitsune-blocking" }
+itertools = { version = "0.12.0", default-features = false }
 ring = { version = "0.17.7", features = ["std"] }
 time = { version = "0.3.31", default-features = false, features = [
     "formatting",

crates/kitsune-http-signatures/Cargo.toml

@@ -118,12 +118,14 @@ impl TryFrom<SignatureHeader<'_>> for String {
 
     fn try_from(value: SignatureHeader<'_>) -> Result<Self, Self::Error> {
         let signature = base64_simd::STANDARD.encode_to_string(value.signature);
-        let headers = value
-            .signature_components
-            .iter()
-            .map(SignatureComponent::as_str)
-            .intersperse(" ")
-            .collect::<String>();
+        let headers = itertools::intersperse(
+            value
+                .signature_components
+                .iter()
+                .map(SignatureComponent::as_str),
+            " ",
+        )
+        .collect::<String>();
 
         let mut signature_header = format!(
             "keyId=\"{}\",signature=\"{signature}\",headers=\"{headers}\"",

crates/kitsune-http-signatures/src/header.rs

@@ -4,7 +4,6 @@
 //! Only supports asymmetric signing schemes (aka. no HMAC and such)
 //!
 
-#![feature(iter_intersperse)]
 #![deny(missing_docs)]
 
 use crate::{header::SignatureHeader, util::UnixTimestampExt};

crates/kitsune-http-signatures/src/lib.rs

@@ -21,7 +21,7 @@ kitsune-util = { path = "../kitsune-util" }
 mime = "0.3.17"
 scoped-futures = "0.1.3"
 serde = "1.0.195"
-simd-json = "0.13.7"
+simd-json = "0.13.8"
 smol_str = "0.2.1"
 speedy-uuid = { path = "../../lib/speedy-uuid" }
 thiserror = "1.0.56"

crates/kitsune-mastodon/Cargo.toml

@@ -16,7 +16,7 @@ redis = { version = "0.24.0", features = [
     "tokio-rustls-comp",
 ] }
 serde = "1.0.195"
-simd-json = "0.13.7"
+simd-json = "0.13.8"
 tokio = { version = "1.35.1", features = ["macros", "rt", "sync"] }
 tokio-stream = { version = "0.1.14", features = ["sync"] }
 tracing = "0.1.40"

crates/kitsune-messaging/Cargo.toml

@@ -21,7 +21,7 @@ openidconnect = { version = "3.4.0", default-features = false, features = [
 ] }
 redis = "0.24.0"
 serde = { version = "1.0.195", features = ["derive"] }
-simd-json = "0.13.7"
+simd-json = "0.13.8"
 speedy-uuid = { path = "../../lib/speedy-uuid", features = ["serde"] }
 thiserror = "1.0.56"
 url = "2.5.0"

crates/kitsune-oidc/Cargo.toml

@@ -52,7 +52,7 @@ rsa = "0.9.6"
 rusty-s3 = { version = "0.5.0", default-features = false }
 scoped-futures = "0.1.3"
 serde = "1.0.195"
-simd-json = "0.13.7"
+simd-json = "0.13.8"
 smol_str = "0.2.1"
 speedy-uuid = { path = "../../lib/speedy-uuid" }
 thiserror = "1.0.56"
@@ -66,7 +66,7 @@ zxcvbn = { version = "2.2.2", default-features = false }
 meilisearch = ["kitsune-search/meilisearch"]
 
 [dev-dependencies]
-hex-simd = { version = "0.8.0", features = ["unstable"] }
+hex-simd = "0.8.0"
 http-body-util = "0.1.0"
 hyper = "1.1.0"
 kitsune-activitypub = { path = "../kitsune-activitypub" }

crates/kitsune-service/Cargo.toml

@@ -7,7 +7,7 @@ edition.workspace = true
 [dependencies]
 iso8601-timestamp = "0.2.16"
 serde = { version = "1.0.195", features = ["derive"] }
-simd-json = "0.13.7"
+simd-json = "0.13.8"
 smol_str = { version = "0.2.1", features = ["serde"] }
 speedy-uuid = { path = "../../lib/speedy-uuid", features = ["serde"] }
 utoipa = { version = "4.2.0", features = ["chrono", "uuid"] }

crates/kitsune-type/Cargo.toml

@@ -22,6 +22,13 @@ pub fn generate_secret() -> String {
         .collect()
 }
 
+const _: () = {
+    assert!(
+        std::mem::size_of::<CowBox<'_, [u8; 1024]>>() <= std::mem::size_of::<usize>() * 2,
+        "Size guarantee violated (should have the size of two or less machine words)",
+    );
+};
+
 #[derive(Clone, Debug)]
 pub enum CowBox<'a, T> {
     Borrowed(&'a T),

crates/kitsune-util/src/lib.rs

@@ -21,7 +21,7 @@ tracing = "0.1.40"
 http-body-util = "0.1.0"
 hyper = "1.1.0"
 pretty_assertions = "1.4.0"
-simd-json = { version = "0.13.7", features = ["hints"] }
+simd-json = "0.13.8"
 tokio = { version = "1.35.1", features = ["macros"] }
 tower = { version = "0.4.13", default-features = false, features = ["util"] }
 

crates/kitsune-webfinger/Cargo.toml

@@ -25,8 +25,8 @@
             inherit overlays system;
           };
           rustPlatform = pkgs.makeRustPlatform {
-            cargo = pkgs.rust-bin.nightly.latest.minimal;
-            rustc = pkgs.rust-bin.nightly.latest.minimal;
+            cargo = pkgs.rust-bin.stable.latest.minimal;
+            rustc = pkgs.rust-bin.stable.latest.minimal;
           };
           baseDependencies = with pkgs; [
             openssl
@@ -128,7 +128,7 @@
                   packages = with pkgs; [
                     cargo-insta
                     diesel-cli
-                    rust-bin.nightly.latest.default
+                    rust-bin.stable.latest.default
                   ]
                   ++
                   baseDependencies;

flake.nix

@@ -42,6 +42,7 @@ headers = "0.4.0"
 http = "1.0.0"
 http-body-util = "0.1.0"
 iso8601-timestamp = "0.2.16"
+itertools = { version = "0.12.0", default-features = false }
 kitsune-activitypub = { path = "../crates/kitsune-activitypub" }
 kitsune-blocking = { path = "../crates/kitsune-blocking" }
 kitsune-cache = { path = "../crates/kitsune-cache" }
@@ -79,7 +80,7 @@ rust-embed = { version = "8.2.0", features = ["include-exclude"] }
 scoped-futures = "0.1.3"
 serde = { version = "1.0.195", features = ["derive"] }
 serde_urlencoded = "0.7.1"
-simd-json = "0.13.7"
+simd-json = "0.13.8"
 speedy-uuid = { path = "../lib/speedy-uuid" }
 strum = { version = "0.25.0", features = ["derive", "phf"] }
 tempfile = "3.9.0"

kitsune/Cargo.toml

@@ -23,12 +23,13 @@ where
     type Error = Error;
 
     fn into_response_parts(self, mut res: ResponseParts) -> Result<ResponseParts, Self::Error> {
-        let value = self
-            .0
-            .into_iter()
-            .map(|(key, value)| Cow::Owned(format!("<{value}>; rel=\"{key}\"")))
-            .intersperse(Cow::Borrowed(", "))
-            .collect::<String>();
+        let value = itertools::intersperse(
+            self.0
+                .into_iter()
+                .map(|(key, value)| Cow::Owned(format!("<{value}>; rel=\"{key}\""))),
+            Cow::Borrowed(", "),
+        )
+        .collect::<String>();
 
         res.headers_mut().insert(
             "Link",

kitsune/src/http/pagination.rs

@@ -1,5 +1,3 @@
-#![feature(iter_intersperse)]
-
 #[macro_use]
 extern crate metrics;
 

kitsune/src/lib.rs

@@ -79,8 +79,7 @@ impl Registrar for OAuthRegistrar {
             if valid_scopes.peek().is_none() {
                 OAuthScope::Read.as_ref().parse().unwrap()
             } else {
-                valid_scopes
-                    .intersperse(" ")
+                itertools::intersperse(valid_scopes, " ")
                     .collect::<String>()
                     .parse()
                     .unwrap()