fix(rust): cleanup/format imports

Author: WillLillis

asm-lsp/config_builder.rs

@@ -4,12 +4,11 @@ use std::{env::current_dir, path::PathBuf};
 
 use anyhow::{anyhow, Result};
 use clap::{arg, Args};
+use dialoguer::{theme::ColorfulTheme, Confirm, FuzzySelect, Input};
 use dirs::config_dir;
 
 use crate::types::{Arch, Assembler, Config, ConfigOptions, ProjectConfig, RootConfig};
 
-use dialoguer::{theme::ColorfulTheme, Confirm, FuzzySelect, Input};
-
 const ARCH_LIST: [Arch; 10] = [
     Arch::X86,
     Arch::X86_64,

asm-lsp/lsp.rs

@@ -1,16 +1,17 @@
-use crate::{ustr, CompletionItems, DocumentStore, Hoverable, ServerStore};
-use std::borrow::ToOwned;
-use std::cmp::Ordering;
-use std::collections::{HashMap, HashSet};
-use std::convert::TryFrom;
-use std::fmt::Write as _;
-use std::fs::{create_dir_all, File};
-use std::io::BufRead;
-use std::path::{Path, PathBuf};
-use std::process::Command;
-use std::str::FromStr;
-use std::string::ToString;
-use std::sync::LazyLock;
+use std::{
+    borrow::ToOwned,
+    cmp::Ordering,
+    collections::{HashMap, HashSet},
+    convert::TryFrom as _,
+    fmt::Write as _,
+    fs::{create_dir_all, File},
+    io::BufRead,
+    path::{Path, PathBuf},
+    process::Command,
+    str::FromStr as _,
+    string::ToString as _,
+    sync::LazyLock,
+};
 
 use anyhow::{anyhow, Result};
 use compile_commands::{CompilationDatabase, CompileArgs, CompileCommand, SourceFile};
@@ -32,10 +33,10 @@ use symbolic::common::{Language, Name, NameMangling};
 use symbolic_demangle::{Demangle, DemangleOptions};
 use tree_sitter::InputEdit;
 
-use crate::types::Column;
 use crate::{
-    Arch, ArchOrAssembler, Assembler, Completable, Config, ConfigOptions, Directive, Instruction,
-    LspClient, NameToInstructionMap, RootConfig, TreeEntry,
+    types::Column, ustr, Arch, ArchOrAssembler, Assembler, Completable, CompletionItems, Config,
+    ConfigOptions, Directive, DocumentStore, Hoverable, Instruction, LspClient,
+    NameToInstructionMap, RootConfig, ServerStore, TreeEntry,
 };
 
 /// Prints information about the server

asm-lsp/parser.rs

@@ -1,18 +1,12 @@
-use crate::{ustr, AvrStatusRegister, AvrTiming};
-use std::collections::HashMap;
-use std::env::args;
-use std::fs;
-use std::io::Write;
-use std::iter::Peekable;
-use std::path::PathBuf;
-use std::str::{FromStr, Lines};
-
-use crate::types::{
-    Arch, Assembler, Directive, Instruction, InstructionForm, MMXMode, NameToDirectiveMap,
-    NameToInstructionMap, NameToRegisterMap, Operand, OperandType, Register, RegisterBitInfo,
-    RegisterType, RegisterWidth, XMMMode, Z80Timing, Z80TimingInfo, ISA,
+use std::{
+    collections::HashMap,
+    env::args,
+    fs,
+    io::Write as _,
+    iter::Peekable,
+    path::PathBuf,
+    str::{FromStr, Lines},
 };
-use crate::InstructionAlias;
 
 use anyhow::{anyhow, Result};
 use htmlentity::entity::ICodedDataTrait;
@@ -26,6 +20,15 @@ use reqwest;
 use serde::Deserialize;
 use url_escape::encode_www_form_urlencoded;
 
+use crate::{
+    types::{
+        Arch, Assembler, Directive, Instruction, InstructionForm, MMXMode, NameToDirectiveMap,
+        NameToInstructionMap, NameToRegisterMap, Operand, OperandType, Register, RegisterBitInfo,
+        RegisterType, RegisterWidth, XMMMode, Z80Timing, Z80TimingInfo, ISA,
+    },
+    ustr, AvrStatusRegister, AvrTiming, InstructionAlias,
+};
+
 /// Parse all of the register information witin the documentation file
 ///
 /// Current function assumes that the RST file is already read and that it's been given a reference

asm-lsp/test.rs

@@ -1,6 +1,5 @@
 #[cfg(test)]
 mod tests {
-    use core::panic;
     use std::{collections::HashMap, path::PathBuf, str::FromStr};
 
     use anyhow::Result;

asm_docs_parsing/src/main.rs

@@ -1,19 +1,19 @@
 use std::path::PathBuf;
 
-use ::asm_lsp::parser::{
-    populate_6502_instructions, populate_arm_instructions, populate_ca65_directives,
-    populate_gas_directives, populate_instructions, populate_masm_nasm_directives,
-    populate_registers, populate_riscv_instructions, populate_riscv_registers,
-};
-use asm_lsp::{
-    parser::{populate_avr_directives, populate_avr_instructions, populate_power_isa_instructions},
-    Arch, Assembler, Directive, Instruction, Register,
-};
-
 use anyhow::{anyhow, Result};
 use clap::{Parser, Subcommand};
 use serde::{Deserialize, Serialize};
 
+use asm_lsp::{
+    parser::{
+        populate_6502_instructions, populate_arm_instructions, populate_avr_directives,
+        populate_avr_instructions, populate_ca65_directives, populate_gas_directives,
+        populate_instructions, populate_masm_nasm_directives, populate_power_isa_instructions,
+        populate_registers, populate_riscv_instructions, populate_riscv_registers,
+    },
+    Arch, Assembler, Directive, Instruction, Register,
+};
+
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, clap::ValueEnum)]
 enum DocType {
     Instruction,