Enable rustfmt nightly options

Author: object-Object

.vscode/settings.json

@@ -2,6 +2,9 @@
     "files.associations": {
         "**/mimex-*.txt": "csv"
     },
+
+    "rust-analyzer.rustfmt.extraArgs": ["+nightly"],
+
     // "rust-analyzer.cargo.noDefaultFeatures": true,
     // "rust-analyzer.cargo.features": ["no_std", "serde_alloc"]
     "rust-analyzer.cargo.features": "all"

rustfmt.toml

@@ -0,0 +1,7 @@
+use_field_init_shorthand = true
+
+unstable_features = true
+
+empty_item_single_line = true
+group_imports = "StdExternalCrate"
+imports_granularity = "Crate"

src/bin/mlogv32.rs

@@ -1,25 +1,32 @@
 #![allow(dead_code)]
 
-use std::borrow::Cow;
-use std::collections::VecDeque;
-use std::io::{Cursor, Read};
-use std::sync::mpsc::{self, Receiver, Sender};
-use std::thread;
-use std::time::Duration;
-use std::{error::Error, fmt::Display, fs::File, path::PathBuf, time::Instant};
+use std::{
+    borrow::Cow,
+    collections::VecDeque,
+    error::Error,
+    fmt::Display,
+    fs::File,
+    io::{Cursor, Read},
+    path::PathBuf,
+    sync::mpsc::{self, Receiver, Sender},
+    thread,
+    time::{Duration, Instant},
+};
 
 use binrw::{BinRead, BinWrite};
 use clap::Parser;
-use cursive::theme::Theme;
-use cursive::view::{Margins, Nameable, Resizable, ScrollStrategy, SizeConstraint};
-use cursive::views::{
-    Checkbox, EditView, LinearLayout, ListView, PaddedView, Panel, ResizedView, ScrollView,
-    SliderView, TextContent, TextView,
+use cursive::{
+    theme::Theme,
+    view::{Margins, Nameable, Resizable, ScrollStrategy, SizeConstraint},
+    views::{
+        Checkbox, EditView, LinearLayout, ListView, PaddedView, Panel, ResizedView, ScrollView,
+        SliderView, TextContent, TextView,
+    },
 };
 use indicatif::ProgressIterator;
 use itertools::Itertools;
 use mindustry_rs::{
-    types::{Object, PackedPoint2, ProcessorConfig, schematics::Schematic},
+    types::{Object, PackedPoint2, ProcessorConfig, Schematic},
     vm::{
         Building, BuildingData, LObject, LValue, LVar, LogicVM, LogicVMBuilder, MEMORY_BANK,
         MESSAGE, MICRO_PROCESSOR, SWITCH, WORLD_PROCESSOR,

src/lib.rs

@@ -1,7 +1,6 @@
 #![no_std]
 
 extern crate alloc;
-
 #[cfg(feature = "std")]
 extern crate std;
 

src/parser/ast.rs

@@ -1,4 +1,5 @@
 use alloc::{string::String, vec::Vec};
+
 use serde::{Deserialize, Serialize};
 
 use crate::types::{ContentType, LAccess};

src/parser/grammar.lalrpop

@@ -3,7 +3,10 @@
 use alloc::{string::String, vec::Vec};
 
 use super::{ast::*, grammar_util::*};
-use crate::types::{colors::{COLORS, to_double_bits}, ContentType, LAccess};
+use crate::types::{
+    ContentType, LAccess,
+    colors::{COLORS, to_double_bits},
+};
 
 grammar;
 

src/parser/mod.rs

@@ -1,30 +1,29 @@
-pub mod ast;
-#[cfg(feature = "std")]
-mod grammar_util;
-
-#[cfg(feature = "std")]
-lalrpop_util::lalrpop_mod!(
-    #[allow(deprecated)]
-    grammar,
-    "/logic/grammar.rs"
-);
-
-#[cfg(feature = "std")]
-pub use grammar::LogicParser;
-
 #[cfg(feature = "serde_alloc")]
 use alloc::vec::Vec;
 #[cfg(feature = "serde_alloc")]
 use core::error::Error;
 #[cfg(feature = "std")]
 use std::{boxed::Box, string::ToString};
 
+#[cfg(feature = "std")]
+pub use self::grammar::LogicParser;
 #[cfg(feature = "std")]
 use crate::{
     types::{PackedPoint2, content},
     vm::{Building, LogicVMBuilder, ProcessorBuilder},
 };
 
+pub mod ast;
+#[cfg(feature = "std")]
+mod grammar_util;
+
+#[cfg(feature = "std")]
+lalrpop_util::lalrpop_mod!(
+    #[allow(deprecated)]
+    grammar,
+    "/logic/grammar.rs"
+);
+
 #[cfg(feature = "std")]
 pub fn parse_and_serialize_ast(
     parser: &LogicParser,

src/types/enums.rs

@@ -2,17 +2,16 @@
 
 use alloc::{format, vec, vec::Vec};
 use core::hash::Hash;
-use serde::{Deserialize, Serialize};
 
 use binrw::prelude::*;
 use lazy_static::lazy_static;
+use serde::{Deserialize, Serialize};
 use strum::VariantArray;
 use strum_macros::{AsRefStr, IntoStaticStr, VariantArray};
 use widestring::{U16Str, U16String};
 
-use crate::utils::leak_u16string;
-
 use super::colors;
+use crate::utils::leak_u16string;
 
 #[binrw]
 #[brw(big, repr = i8)]

src/types/mod.rs

@@ -1,18 +1,13 @@
-#![allow(deprecated)]
+#[cfg(feature = "std")]
+pub use self::schematics::*;
+pub use self::{enums::*, java::*, logic::*, math::*, type_io::*};
 
 pub mod colors;
 pub mod content;
-#[cfg(feature = "std")]
-pub mod schematics;
-
 mod enums;
 mod java;
 mod logic;
 mod math;
+#[cfg(feature = "std")]
+mod schematics;
 mod type_io;
-
-pub use enums::*;
-pub use java::*;
-pub use logic::*;
-pub use math::*;
-pub use type_io::*;

src/types/schematics.rs

@@ -201,9 +201,8 @@ mod tests {
 
     use velcro::map_iter_from;
 
-    use crate::types::{ContentID, ContentType};
-
     use super::*;
+    use crate::types::{ContentID, ContentType};
 
     type TestResult = Result<(), Box<dyn Error>>;
 
@@ -359,15 +358,12 @@ mod tests {
         let mut cur = Cursor::new(vec![]);
         schem.write(&mut cur)?;
         cur.set_position(0);
-        assert_eq!(
-            Schematic::read(&mut cur)?,
-            Schematic {
-                tags: map_iter_from! { "labels": "[]" }.collect(),
-                width: 1,
-                height: 1,
-                ..schem
-            }
-        );
+        assert_eq!(Schematic::read(&mut cur)?, Schematic {
+            tags: map_iter_from! { "labels": "[]" }.collect(),
+            width: 1,
+            height: 1,
+            ..schem
+        });
         Ok(())
     }
 
@@ -384,15 +380,12 @@ mod tests {
         let mut cur = Cursor::new(vec![]);
         schem.write(&mut cur)?;
         cur.set_position(0);
-        assert_eq!(
-            Schematic::read(&mut cur)?,
-            Schematic {
-                tags: map_iter_from! { "labels": "[]" }.collect(),
-                width: 1,
-                height: 1,
-                ..schem
-            }
-        );
+        assert_eq!(Schematic::read(&mut cur)?, Schematic {
+            tags: map_iter_from! { "labels": "[]" }.collect(),
+            width: 1,
+            height: 1,
+            ..schem
+        });
         Ok(())
     }
 
@@ -429,15 +422,12 @@ mod tests {
         let mut cur = Cursor::new(vec![]);
         schem.write(&mut cur)?;
         cur.set_position(0);
-        assert_eq!(
-            Schematic::read(&mut cur)?,
-            Schematic {
-                tags: map_iter_from! { "labels": "[]" }.collect(),
-                width: 3,
-                height: 1,
-                ..schem
-            }
-        );
+        assert_eq!(Schematic::read(&mut cur)?, Schematic {
+            tags: map_iter_from! { "labels": "[]" }.collect(),
+            width: 3,
+            height: 1,
+            ..schem
+        });
         Ok(())
     }
 }