bridge: Reformat imports using nightly (#1280)

Author: svix-jplatte

.github/workflows/bridge-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: bridge
+
   test-versions:
     name: Webhook Bridge 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: "bridge -> target"
@@ -47,10 +63,6 @@ jobs:
 
     - uses: taiki-e/install-action@nextest
 
-    - name: rustfmt
-      run: cargo fmt -- --check
-      working-directory: bridge
-
     - name: Install dependencies
       # Packages should align with whatever is in the bridge/Dockerfile
       run: |

bridge/.rustfmt.toml

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

bridge/svix-bridge-plugin-queue/src/config.rs

@@ -1,14 +1,17 @@
-pub use crate::gcp_pubsub::{GCPPubSubInputOpts, GCPPubSubOutputOpts};
-pub use crate::rabbitmq::{RabbitMqInputOpts, RabbitMqOutputOpts};
-pub use crate::receiver_output::QueueForwarder;
-pub use crate::redis::{RedisInputOpts, RedisOutputOpts};
-use crate::sender_input::QueueSender;
-pub use crate::sqs::{SqsInputOpts, SqsOutputOpts};
 use serde::Deserialize;
 use svix_bridge_types::{
     ReceiverOutput, SenderInput, SenderOutputOpts, TransformationConfig, TransformerInputFormat,
 };
 
+use crate::sender_input::QueueSender;
+pub use crate::{
+    gcp_pubsub::{GCPPubSubInputOpts, GCPPubSubOutputOpts},
+    rabbitmq::{RabbitMqInputOpts, RabbitMqOutputOpts},
+    receiver_output::QueueForwarder,
+    redis::{RedisInputOpts, RedisOutputOpts},
+    sqs::{SqsInputOpts, SqsOutputOpts},
+};
+
 #[derive(Deserialize)]
 pub struct QueueConsumerConfig {
     pub name: String,
@@ -85,14 +88,16 @@ pub enum ReceiverOutputOpts {
 
 #[cfg(test)]
 mod tests {
-    use super::into_receiver_output;
-    use super::QueueConsumerConfig;
-    use crate::config::{ReceiverOutputOpts, SenderInputOpts};
-    use crate::redis::{RedisInputOpts, RedisOutputOpts};
     use svix_bridge_types::{
         SenderOutputOpts, SvixSenderOutputOpts, TransformationConfig, TransformerInputFormat,
     };
 
+    use super::{into_receiver_output, QueueConsumerConfig};
+    use crate::{
+        config::{ReceiverOutputOpts, SenderInputOpts},
+        redis::{RedisInputOpts, RedisOutputOpts},
+    };
+
     // FIXME: can't support raw payload access for redis because it requires JSON internally.
     //   Revisit after `omniqueue` adoption.
     #[test]

bridge/svix-bridge-plugin-queue/src/gcp_pubsub/mod.rs

@@ -1,7 +1,9 @@
-use crate::error::{Error, Result};
+use std::path::PathBuf;
+
 use omniqueue::{backends, DynConsumer, DynProducer};
 use serde::Deserialize;
-use std::path::PathBuf;
+
+use crate::error::{Error, Result};
 
 #[derive(Debug, Default, Deserialize)]
 pub struct GCPPubSubInputOpts {

bridge/svix-bridge-plugin-queue/src/lib.rs

@@ -1,5 +1,6 @@
-use omniqueue::{Delivery, DynConsumer, QueueError};
 use std::time::{Duration, Instant};
+
+use omniqueue::{Delivery, DynConsumer, QueueError};
 use svix_bridge_types::{
     async_trait, svix::api::Svix, CreateMessageRequest, JsObject, TransformationConfig,
     TransformerInput, TransformerInputFormat, TransformerJob, TransformerOutput, TransformerTx,

bridge/svix-bridge-plugin-queue/src/rabbitmq/mod.rs

@@ -1,7 +1,8 @@
-use crate::error::{Error, Result};
 use omniqueue::{backends, DynConsumer, DynProducer};
 use serde::Deserialize;
 
+use crate::error::{Error, Result};
+
 #[derive(Debug, Deserialize)]
 pub struct RabbitMqInputOpts {
     /// Connection string for RabbitMQ.

bridge/svix-bridge-plugin-queue/src/receiver_output/mod.rs

@@ -1,9 +1,10 @@
-use crate::config::ReceiverOutputOpts;
-use crate::error::Result;
-use omniqueue::DynProducer;
 use std::sync::Arc;
+
+use omniqueue::DynProducer;
 use svix_bridge_types::{async_trait, ForwardRequest, ReceiverOutput};
 
+use crate::{config::ReceiverOutputOpts, error::Result};
+
 #[derive(Clone)]
 pub struct QueueForwarder {
     name: String,

bridge/svix-bridge-plugin-queue/src/redis/mod.rs

@@ -1,8 +1,8 @@
-use crate::error::{Error, Result};
 use omniqueue::{backends, DynConsumer, DynProducer};
-
 use serde::Deserialize;
 
+use crate::error::{Error, Result};
+
 #[derive(Debug, Default, Deserialize)]
 pub struct RedisInputOpts {
     pub dsn: String,

bridge/svix-bridge-plugin-queue/src/sender_input/mod.rs

@@ -1,10 +1,11 @@
-use crate::config::SenderInputOpts;
-use crate::{error::Error, gcp_pubsub, rabbitmq, run_inner, sqs, Consumer};
 use omniqueue::DynConsumer;
-
-use svix_bridge_types::svix::api::Svix;
 use svix_bridge_types::{
-    async_trait, SenderInput, SenderOutputOpts, TransformationConfig, TransformerTx,
+    async_trait, svix::api::Svix, SenderInput, SenderOutputOpts, TransformationConfig,
+    TransformerTx,
+};
+
+use crate::{
+    config::SenderInputOpts, error::Error, gcp_pubsub, rabbitmq, run_inner, sqs, Consumer,
 };
 
 pub struct QueueSender {

bridge/svix-bridge-plugin-queue/src/sqs/mod.rs

@@ -1,7 +1,8 @@
-use crate::error::{Error, Result};
 use omniqueue::{backends, DynConsumer, DynProducer};
 use serde::Deserialize;
 
+use crate::error::{Error, Result};
+
 #[derive(Debug, Default, Deserialize)]
 pub struct SqsInputOpts {
     pub queue_dsn: String,