use nightly rustfmt and sort imports (#145)

crates/djls-templates/src/ast.rs

@@ -1,7 +1,10 @@
-use crate::tokens::{Token, TokenStream, TokenType};
 use serde::Serialize;
 use thiserror::Error;
 
+use crate::tokens::Token;
+use crate::tokens::TokenStream;
+use crate::tokens::TokenType;
+
 #[derive(Clone, Debug, Default, Serialize)]
 pub struct Ast {
     nodelist: Vec<Node>,

crates/djls-templates/src/error.rs

@@ -1,10 +1,12 @@
-use crate::ast::{AstError, Span};
-use crate::lexer::LexerError;
-use crate::parser::ParserError;
 use serde::Serialize;
 use thiserror::Error;
 use tower_lsp_server::lsp_types;
 
+use crate::ast::AstError;
+use crate::ast::Span;
+use crate::lexer::LexerError;
+use crate::parser::ParserError;
+
 #[derive(Debug, Error, Serialize)]
 pub enum TemplateError {
     #[error("Lexer error: {0}")]

crates/djls-templates/src/lexer.rs

@@ -1,6 +1,9 @@
-use crate::tokens::{Token, TokenStream, TokenType};
 use thiserror::Error;
 
+use crate::tokens::Token;
+use crate::tokens::TokenStream;
+use crate::tokens::TokenType;
+
 pub struct Lexer {
     source: String,
     chars: Vec<char>,

crates/djls-templates/src/lib.rs

@@ -6,10 +6,12 @@ mod tagspecs;
 mod tokens;
 
 use ast::Ast;
-pub use error::{to_lsp_diagnostic, QuickFix, TemplateError};
-
+pub use error::to_lsp_diagnostic;
+pub use error::QuickFix;
+pub use error::TemplateError;
 use lexer::Lexer;
-pub use parser::{Parser, ParserError};
+pub use parser::Parser;
+pub use parser::ParserError;
 
 /// Parses a Django template and returns the AST and any parsing errors.
 ///

crates/djls-templates/src/parser.rs

@@ -1,8 +1,14 @@
-use crate::ast::{Ast, AstError, Node, Span};
-use crate::lexer::LexerError;
-use crate::tokens::{Token, TokenStream, TokenType};
 use thiserror::Error;
 
+use crate::ast::Ast;
+use crate::ast::AstError;
+use crate::ast::Node;
+use crate::ast::Span;
+use crate::lexer::LexerError;
+use crate::tokens::Token;
+use crate::tokens::TokenStream;
+use crate::tokens::TokenType;
+
 pub struct Parser {
     tokens: TokenStream,
     current: usize,

crates/djls-templates/src/tagspecs.rs

@@ -1,8 +1,10 @@
-use anyhow::Result;
-use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::fs;
 use std::path::Path;
+
+use anyhow::Result;
+use serde::Deserialize;
+use serde::Serialize;
 use thiserror::Error;
 use toml::Value;
 
@@ -184,9 +186,10 @@ pub struct EndTag {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use std::fs;
 
+    use super::*;
+
     #[test]
     fn test_can_load_builtins() -> Result<(), anyhow::Error> {
         let specs = TagSpecs::load_builtin_specs()?;

crates/djls-templates/src/tokens.rs

@@ -1,5 +1,7 @@
+use std::ops::Deref;
+use std::ops::DerefMut;
+
 use serde::Serialize;
-use std::ops::{Deref, DerefMut};
 
 #[derive(Clone, Debug, Serialize, PartialEq)]
 pub enum TokenType {