aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFuwn <[email protected]>2021-05-17 10:18:40 +0000
committerFuwn <[email protected]>2021-05-17 10:18:40 +0000
commitd240b2df7e7d52c5034faa8886084ea3665d46c3 (patch)
treea21d8d68e6493b75719330cbadbda48b64cc6475
parentrefactor(global): even more modules becoming crates (diff)
downloadwhirl-d240b2df7e7d52c5034faa8886084ea3665d46c3.tar.xz
whirl-d240b2df7e7d52c5034faa8886084ea3665d46c3.zip
style(global): cargo formatting
-rw-r--r--rustfmt.toml2
-rw-r--r--whirl_core/src/db/schema.rs6
-rw-r--r--whirl_core/src/main.rs2
-rw-r--r--whirl_core/src/subs.rs4
-rw-r--r--whirl_prompt/src/lib.rs2
5 files changed, 5 insertions, 11 deletions
diff --git a/rustfmt.toml b/rustfmt.toml
index 74ad3a4..0c6a0b8 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -8,7 +8,7 @@ force_multiline_blocks = true
format_code_in_doc_comments = true
format_macro_matchers = true
format_strings = true
-ignore = ["src/db/schema.rs"]
+ignore = ["whirl_core/src/db/schema.rs"]
imports_layout = "HorizontalVertical"
license_template_path = ".license_template"
match_arm_blocks = false
diff --git a/whirl_core/src/db/schema.rs b/whirl_core/src/db/schema.rs
index e2c0da4..6d58598 100644
--- a/whirl_core/src/db/schema.rs
+++ b/whirl_core/src/db/schema.rs
@@ -32,8 +32,4 @@ table! {
}
}
-allow_tables_to_appear_in_same_query!(
- serial_numbers,
- user_properties,
- user_registration,
-);
+allow_tables_to_appear_in_same_query!(serial_numbers, user_properties, user_registration,);
diff --git a/whirl_core/src/main.rs b/whirl_core/src/main.rs
index 32866b5..8a1874a 100644
--- a/whirl_core/src/main.rs
+++ b/whirl_core/src/main.rs
@@ -3,8 +3,8 @@
use std::error::Error;
-use whirl_core::{cli::Cli, utils::log::calculate_log_level};
use whirl_config::Config;
+use whirl_core::{cli::Cli, utils::log::calculate_log_level};
#[tokio::main]
async fn main() -> Result<(), Box<dyn Error>> {
diff --git a/whirl_core/src/subs.rs b/whirl_core/src/subs.rs
index e9cf0e2..09303c9 100644
--- a/whirl_core/src/subs.rs
+++ b/whirl_core/src/subs.rs
@@ -10,9 +10,7 @@ use whirl_server::{
ServerType::{AutoServer, RoomServer},
};
-use crate::{
- api::Api,
-};
+use crate::api::Api;
pub async fn run() {
let (tx, _rx) = std::sync::mpsc::channel();
diff --git a/whirl_prompt/src/lib.rs b/whirl_prompt/src/lib.rs
index 85a725b..613c507 100644
--- a/whirl_prompt/src/lib.rs
+++ b/whirl_prompt/src/lib.rs
@@ -37,7 +37,7 @@ impl Prompt {
Prompt::tokenize_command(prompt.read_command()),
prompt.history.clone(),
)
- .await;
+ .await;
}
}