server: Reformat remaining imports using nightly (#1282)

server: Reformat remaining imports using nightly

Author: svix-jplatte

.github/workflows/server-ci.yml

@@ -24,6 +24,20 @@ env:
   RUST_BACKTRACE: 1
 
 jobs:
+  check-fmt:
+    name: Check formatting
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: dtolnay/rust-toolchain@nightly
+        with:
+          components: rustfmt
+
+      - name: rustfmt
+        run: cargo fmt -- --check
+        working-directory: server
+
   test-versions:
     name: Server CI
     runs-on: ubuntu-latest
@@ -32,10 +46,12 @@ jobs:
         rust: [stable, beta]
     steps:
     - uses: actions/checkout@v4
+
     - uses: dtolnay/rust-toolchain@master
       with:
         toolchain: ${{ matrix.rust }}
-        components: clippy, rustfmt
+        components: clippy
+
     - uses: Swatinem/rust-cache@v2
       with:
         workspaces: "server -> target"
@@ -47,10 +63,6 @@ jobs:
 
     - uses: taiki-e/install-action@nextest
 
-    - name: rustfmt
-      run: cargo fmt -- --check
-      working-directory: server
-
     - name: Build
       run: cargo test --all-features --no-run --locked
       working-directory: server

server/.rustfmt.toml

@@ -0,0 +1,2 @@
+imports_granularity = "Crate"
+group_imports = "StdExternalCrate"

server/svix-server/src/core/cache/memory.rs

@@ -1,16 +1,15 @@
 // SPDX-FileCopyrightText: © 2022 Svix Authors
 // SPDX-License-Identifier: MIT
 
+use std::{collections::HashMap, sync::Arc};
+
+use axum::async_trait;
 use tokio::{
     sync::RwLock,
     task,
     time::{sleep, Duration, Instant},
 };
 
-use axum::async_trait;
-use std::collections::HashMap;
-use std::sync::Arc;
-
 use super::{Cache, CacheBehavior, CacheKey, Result};
 
 #[derive(Debug)]
@@ -105,12 +104,13 @@ fn check_is_expired(vw: &ValueWrapper) -> bool {
 
 #[cfg(test)]
 mod tests {
+    use serde::{Deserialize, Serialize};
+
     use super::{
         super::{kv_def, CacheValue},
         *,
     };
     use crate::core::cache::string_kv_def;
-    use serde::{Deserialize, Serialize};
 
     // Test structures
 

server/svix-server/src/core/cache/redis.rs

@@ -6,9 +6,8 @@ use std::time::Duration;
 use axum::async_trait;
 use redis::AsyncCommands as _;
 
-use crate::redis::RedisPool;
-
 use super::{Cache, CacheBehavior, CacheKey, Error, Result};
+use crate::redis::RedisPool;
 
 pub fn new(redis: RedisPool) -> Cache {
     RedisCache { redis }.into()
@@ -76,12 +75,12 @@ impl CacheBehavior for RedisCache {
 
 #[cfg(test)]
 mod tests {
+    use serde::{Deserialize, Serialize};
+
     use super::{
         super::{kv_def, string_kv_def, CacheValue},
         *,
     };
-    use serde::{Deserialize, Serialize};
-
     use crate::cfg::CacheType;
 
     // Test structures

server/svix-server/src/core/cryptography.rs

@@ -3,8 +3,10 @@
 
 use std::fmt::Debug;
 
-use chacha20poly1305::aead::{Aead, KeyInit};
-use chacha20poly1305::{Key, XChaCha20Poly1305, XNonce};
+use chacha20poly1305::{
+    aead::{Aead, KeyInit},
+    Key, XChaCha20Poly1305, XNonce,
+};
 use ed25519_compact::*;
 use rand::Rng;
 

server/svix-server/src/core/idempotency.rs

@@ -14,10 +14,8 @@ use axum::{
     http::{Request, Response, StatusCode},
     response::IntoResponse,
 };
-
 use blake2::{Blake2b512, Digest};
 use http::request::Parts;
-
 use serde::{Deserialize, Serialize};
 use tower::Service;
 

server/svix-server/src/core/message_app.rs

@@ -4,6 +4,7 @@ use chrono::{DateTime, FixedOffset, Utc};
 use sea_orm::{DatabaseConnection, DatabaseTransaction, TransactionTrait};
 use serde::{Deserialize, Serialize};
 
+use super::types::EventTypeName;
 use crate::{
     core::{
         cache::{kv_def, Cache, CacheBehavior, CacheKey, CacheValue},
@@ -17,8 +18,6 @@ use crate::{
     error::{Error, Result},
 };
 
-use super::types::EventTypeName;
-
 /// The information cached during the creation of a message. Includes a [`Vec`] of all endpoints
 /// associated with the given application and organization ID.
 #[derive(Deserialize, Serialize, Debug, Clone)]

server/svix-server/src/core/operational_webhooks.rs

@@ -18,8 +18,8 @@ use super::{
         MessageUid, OrganizationId,
     },
 };
-use crate::core::security::JwtSigningConfig;
 use crate::{
+    core::security::JwtSigningConfig,
     db::models::{endpoint, messageattempt},
     error::{Error, HttpError, Result},
 };

server/svix-server/src/core/permissions.rs

@@ -5,17 +5,15 @@ use axum::{
     http::request::Parts,
 };
 
-use crate::error::Traceable;
-use crate::{
-    db::models::{application, applicationmetadata},
-    error::{Error, HttpError, Result},
-    AppState,
-};
-
 use super::{
     security::{permissions_from_bearer, AccessLevel, Permissions},
     types::{ApplicationId, ApplicationIdOrUid, FeatureFlagSet, OrganizationId},
 };
+use crate::{
+    db::models::{application, applicationmetadata},
+    error::{Error, HttpError, Result, Traceable},
+    AppState,
+};
 
 pub struct ReadAll {
     pub org_id: OrganizationId,

server/svix-server/src/core/security.rs

@@ -7,21 +7,17 @@ use axum::{
     extract::{FromRequestParts, TypedHeader},
     headers::{authorization::Bearer, Authorization},
 };
-
 use http::request::Parts;
 use jwt_simple::prelude::*;
 use serde::Deserializer;
-
 use validator::Validate;
 
-use crate::error::Error;
+use super::types::{ApplicationId, FeatureFlagSet, OrganizationId};
 use crate::{
-    error::{HttpError, Result},
+    error::{Error, HttpError, Result},
     AppState,
 };
 
-use super::types::{ApplicationId, FeatureFlagSet, OrganizationId};
-
 /// The default org_id we use (useful for generating JWTs when testing).
 pub fn default_org_id() -> OrganizationId {
     OrganizationId("org_23rb8YdGqMT0qIzpgGwdXfHirMu".to_owned())