chore: Reformat code with nightly rustfmt

Provisionally switching to nightly toolchain as it has more options
for rustfmt and does not have linker issues with long type names on Mac.

Author: ngeor

.github/workflows/build.yml

@@ -4,11 +4,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          toolchain: nightly
           target: x86_64-pc-windows-gnu
       - name: Build Debug
         uses: actions-rs/cargo@v1

.github/workflows/release.yml

@@ -7,11 +7,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          toolchain: nightly
           target: x86_64-pc-windows-gnu
       - name: Build Debug
         uses: actions-rs/cargo@v1

rustfmt.toml

@@ -0,0 +1,4 @@
+unstable_features = true
+imports_layout = "Horizontal"
+imports_granularity = "Module"
+group_imports = "StdExternalCrate"

rusty_basic/src/bin/rusty_basic.rs

@@ -1,10 +1,10 @@
+use std::env;
+use std::fs::File;
+
 use rusty_basic::instruction_generator::{generate_instructions, unwrap_linter_context};
 use rusty_basic::interpreter::{new_default_interpreter, InterpreterTrait};
 use rusty_linter::{lint, Context};
-use rusty_parser::parse_main_file;
-use rusty_parser::Program;
-use std::env;
-use std::fs::File;
+use rusty_parser::{parse_main_file, Program};
 
 fn main() {
     let is_running_in_apache = is_running_in_apache();

rusty_basic/src/instruction_generator/calls.rs

@@ -1,8 +1,9 @@
-use crate::instruction_generator::{AddressOrLabel, Instruction, InstructionGenerator};
 use rusty_common::{AtPos, Position, Positioned};
 use rusty_linter::SubprogramName;
 use rusty_parser::*;
 
+use crate::instruction_generator::{AddressOrLabel, Instruction, InstructionGenerator};
+
 impl InstructionGenerator {
     pub fn generate_built_in_function_call_instructions(
         &mut self,

rusty_basic/src/instruction_generator/dim.rs

@@ -1,8 +1,9 @@
-use super::{Instruction, InstructionGenerator, RootPath};
 use rusty_common::*;
 use rusty_parser::*;
 use rusty_variant::Variant;
 
+use super::{Instruction, InstructionGenerator, RootPath};
+
 impl InstructionGenerator {
     pub fn visit_dim_list(&mut self, item: DimList) {
         let DimList { shared, variables } = item;

rusty_basic/src/instruction_generator/expression.rs

@@ -1,8 +1,9 @@
-use super::{Instruction, InstructionGenerator, RootPath};
 use rusty_common::*;
 use rusty_parser::*;
 use rusty_variant::Variant;
 
+use super::{Instruction, InstructionGenerator, RootPath};
+
 impl InstructionGenerator {
     pub fn generate_expression_instructions_casting(
         &mut self,

rusty_basic/src/instruction_generator/if_block.rs

@@ -1,7 +1,8 @@
-use super::{InstructionGenerator, Visitor};
 use rusty_common::*;
 use rusty_parser::IfBlock;
 
+use super::{InstructionGenerator, Visitor};
+
 impl InstructionGenerator {
     pub fn generate_if_block_instructions(&mut self, if_block_statement: IfBlock, pos: Position) {
         let IfBlock {

rusty_basic/src/instruction_generator/instruction_generator.rs

@@ -1,19 +1,16 @@
-use crate::instruction_generator::label_resolver::LabelResolver;
-use crate::instruction_generator::subprogram_info::{
-    SubprogramInfoCollector, SubprogramInfoRepository,
-};
-use crate::RuntimeError;
 use rusty_common::{AtPos, CaseInsensitiveString, Position, Positioned};
 use rusty_linter::{Context, Names, SubprogramName};
-use rusty_parser::{Assignment, BuiltInSub};
 use rusty_parser::{
-    BareName, DimVar, Expression, ExpressionType, FileHandle, FunctionImplementation,
-    GlobalStatement, HasExpressionType, Name, Parameter, Program, Statement, Statements,
-    SubImplementation, TypeQualifier,
+    Assignment, BareName, BuiltInFunction, BuiltInSub, DimVar, Expression, ExpressionType, FileHandle, FunctionImplementation, GlobalStatement, HasExpressionType, Name, Parameter, Program, Statement, Statements, SubImplementation, TypeQualifier, UserDefinedTypes
 };
-use rusty_parser::{BuiltInFunction, UserDefinedTypes};
 use rusty_variant::Variant;
 
+use crate::instruction_generator::label_resolver::LabelResolver;
+use crate::instruction_generator::subprogram_info::{
+    SubprogramInfoCollector, SubprogramInfoRepository
+};
+use crate::RuntimeError;
+
 pub fn unwrap_linter_context(linter_context: Context) -> (Names, UserDefinedTypes) {
     let (pre_linter_result, linter_names) = linter_context.into();
     let user_defined_types = pre_linter_result.into();

rusty_basic/src/instruction_generator/label_resolver.rs

@@ -1,7 +1,9 @@
-use crate::instruction_generator::{AddressOrLabel, Instruction, InstructionPos};
-use rusty_common::{CaseInsensitiveString, Positioned};
 use std::collections::HashMap;
 
+use rusty_common::{CaseInsensitiveString, Positioned};
+
+use crate::instruction_generator::{AddressOrLabel, Instruction, InstructionPos};
+
 pub struct LabelResolver {
     pub instructions: Vec<InstructionPos>,
 }