From ecad886ed95c0a9794592b13616143fde6312981 Mon Sep 17 00:00:00 2001 From: Caznix Date: Thu, 5 Dec 2024 11:00:08 -0500 Subject: [PATCH] add rust formatting rules --- engine/src/core/renderer/mod.rs | 6 +++--- engine/src/core/repl/commands.rs | 3 ++- engine/src/core/repl/mod.rs | 3 ++- engine/src/core/repl/repl.rs | 19 ++++++++++++------- engine/src/utils/logger.rs | 7 ++++--- rust-toolchain.toml | 2 ++ rustfmt.toml | 7 +++++++ 7 files changed, 32 insertions(+), 15 deletions(-) create mode 100644 rust-toolchain.toml create mode 100644 rustfmt.toml diff --git a/engine/src/core/renderer/mod.rs b/engine/src/core/renderer/mod.rs index 65486a3..7a9147b 100644 --- a/engine/src/core/renderer/mod.rs +++ b/engine/src/core/renderer/mod.rs @@ -1,8 +1,8 @@ pub mod ctx; -use ctx::WgpuCtx; - -use log::{debug, trace}; use std::sync::Arc; + +use ctx::WgpuCtx; +use log::{debug, trace}; use winit::application::ApplicationHandler; use winit::event::WindowEvent; use winit::event_loop::ActiveEventLoop; diff --git a/engine/src/core/repl/commands.rs b/engine/src/core/repl/commands.rs index 97b95c8..518b79c 100644 --- a/engine/src/core/repl/commands.rs +++ b/engine/src/core/repl/commands.rs @@ -1,6 +1,7 @@ -use super::COMMAND_LIST; use std::process::Command; +use super::COMMAND_LIST; + pub(crate) fn say_hello() { println!("Hello, World!"); } diff --git a/engine/src/core/repl/mod.rs b/engine/src/core/repl/mod.rs index 19a0cdf..87776ec 100644 --- a/engine/src/core/repl/mod.rs +++ b/engine/src/core/repl/mod.rs @@ -1,10 +1,11 @@ pub mod commands; pub mod repl; +use std::{borrow::Borrow, collections::HashMap, sync::Arc}; + use lazy_static::lazy_static; use log::{debug, info}; use parking_lot::RwLock; -use std::{borrow::Borrow, collections::HashMap, sync::Arc}; lazy_static! { pub static ref COMMAND_LIST: Arc = Arc::new(CommandList::new()); diff --git a/engine/src/core/repl/repl.rs b/engine/src/core/repl/repl.rs index 354cb89..bb675ee 100644 --- a/engine/src/core/repl/repl.rs +++ b/engine/src/core/repl/repl.rs @@ -1,7 +1,8 @@ -use crate::{ - core::repl::{commands, Callable, COMMAND_LIST}, - utils::logger::LOGGER, +use std::{ + borrow::Cow::{self, Borrowed, Owned}, + sync::{Arc, Mutex}, }; + use anyhow::Result; use chrono::Local; use colored::Colorize; @@ -12,9 +13,10 @@ use rustyline::{ Cmd, Completer, ConditionalEventHandler, Editor, Event, EventContext, EventHandler, Helper, Hinter, KeyEvent, RepeatCount, Validator, }; -use std::{ - borrow::Cow::{self, Borrowed, Owned}, - sync::{Arc, Mutex}, + +use crate::{ + core::repl::{commands, Callable, COMMAND_LIST}, + utils::logger::LOGGER, }; #[derive(Completer, Helper, Hinter, Validator)] @@ -48,7 +50,10 @@ impl ConditionalEventHandler for BacktickEventHandler { if let Some(k) = evt.get(0) { if *k == KeyEvent::from('`') { let mut state = self.toggle_state.lock().unwrap(); - println!("Stdout Logging: {}", if *state { "ON".green() } else { "OFF".red() }); + println!( + "Stdout Logging: {}", + if *state { "ON".green() } else { "OFF".red() } + ); if *state { LOGGER.write_to_stdout(); } else { diff --git a/engine/src/utils/logger.rs b/engine/src/utils/logger.rs index 1830a45..63b3dad 100644 --- a/engine/src/utils/logger.rs +++ b/engine/src/utils/logger.rs @@ -1,10 +1,11 @@ -use colored::Colorize; -use log::{Level, Log, Metadata, Record}; -use once_cell::sync::Lazy; use std::fs::OpenOptions; use std::io::{self, Write}; use std::sync::{Arc, Mutex}; +use colored::Colorize; +use log::{Level, Log, Metadata, Record}; +use once_cell::sync::Lazy; + pub static LOGGER: Lazy = Lazy::new(DynamicLogger::new); // A logger that dynamically switches between file and stdout diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..271800c --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "nightly" \ No newline at end of file diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 0000000..2678f0b --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1,7 @@ +indent_style = "Block" +wrap_comments = true +format_code_in_doc_comments = true +trailing_comma = "Vertical" +group_imports = "StdExternalCrate" +reorder_impl_items = true +unstable_features = true \ No newline at end of file