diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 0000000..5cf55b7
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1,3 @@
+unstable_features = true
+group_imports = "StdExternalCrate"
+imports_granularity = "Module"
diff --git a/shell.nix b/shell.nix
index cf1fb84..747b6c1 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,4 +1,6 @@
-{ pkgs ? import (import ./npins).nixpkgs { } }:
+{
+ pkgs ? import (import ./npins).nixpkgs { },
+}:
pkgs.mkShell {
buildInputs = [
pkgs.cargo
@@ -7,6 +9,6 @@ pkgs.mkShell {
pkgs.signal-cli
pkgs.rustc
pkgs.rust-analyzer
- pkgs.rustfmt
+ (pkgs.rustfmt.override { asNightly = true; })
];
}
diff --git a/src/main.rs b/src/main.rs
index 479c3ee..b3cc2ae 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,20 +1,18 @@
mod jsonrpc;
mod transform;
mod transports;
-use crate::jsonrpc::RpcClient;
-use irc::client::ClientStream;
-use jsonrpsee::core::client::SubscriptionClientT;
-use log;
-use serde_json::Value;
use std::path::Path;
-use transform::Bridge;
-
-use jsonrpsee::core::client::Subscription;
-use pretty_env_logger;
use futures::future::try_join;
use futures::prelude::*;
use irc::client::prelude::*;
+use irc::client::ClientStream;
+use jsonrpsee::core::client::{Subscription, SubscriptionClientT};
+use serde_json::Value;
+use transform::Bridge;
+use {log, pretty_env_logger};
+
+use crate::jsonrpc::RpcClient;
const CHANNEL: &str = "#hackens-signal";
const MEDIA_DIR: &str = "./www";
@@ -149,7 +147,11 @@ async fn handle_signal(
.map_err(|e| format!("error while sending to irc: {e}"))?;
}
}
- Some(Err(err)) => return Err(format!("error while retrieving messages from signal: {err}")),
+ Some(Err(err)) => {
+ return Err(format!(
+ "error while retrieving messages from signal: {err}"
+ ))
+ }
}
}
}
diff --git a/src/transform.rs b/src/transform.rs
index 08cc267..0a1e4be 100644
--- a/src/transform.rs
+++ b/src/transform.rs
@@ -1,7 +1,7 @@
-use irc::client::prelude::*;
-use serde_json::Map;
-use serde_json::Value;
use std::path::Path;
+
+use irc::client::prelude::*;
+use serde_json::{Map, Value};
use tokio::fs::copy;
#[derive(Default)]
diff --git a/src/transports/mod.rs b/src/transports/mod.rs
index f2a5a32..1298050 100644
--- a/src/transports/mod.rs
+++ b/src/transports/mod.rs
@@ -15,11 +15,10 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-use futures_util::{stream::StreamExt, Sink, SinkExt, Stream};
-use jsonrpsee::core::{
- async_trait,
- client::{ReceivedMessage, TransportReceiverT, TransportSenderT},
-};
+use futures_util::stream::StreamExt;
+use futures_util::{Sink, SinkExt, Stream};
+use jsonrpsee::core::async_trait;
+use jsonrpsee::core::client::{ReceivedMessage, TransportReceiverT, TransportSenderT};
use thiserror::Error;
pub mod ipc;
diff --git a/src/transports/stream_codec.rs b/src/transports/stream_codec.rs
index 2c445bb..6a58ed7 100644
--- a/src/transports/stream_codec.rs
+++ b/src/transports/stream_codec.rs
@@ -15,8 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-use bytes::BytesMut;
use std::{io, str};
+
+use bytes::BytesMut;
use tokio_util::codec::{Decoder, Encoder};
type Separator = u8;