From 984d59b44d002f86f0d26a140e50902b652a89c7 Mon Sep 17 00:00:00 2001
From: Alex van de Sandt <alex@avandesa.dev>
Date: Sat, 18 May 2024 16:18:08 -0400
Subject: [PATCH] Reorganize imports

---
 src/ast.rs          | 6 ++++--
 src/parser.rs       | 5 ++---
 src/runners/repl.rs | 3 +--
 src/scanner.rs      | 6 ++++--
 src/span.rs         | 6 ++++--
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/ast.rs b/src/ast.rs
index e5bcfc2..245a09b 100644
--- a/src/ast.rs
+++ b/src/ast.rs
@@ -1,5 +1,7 @@
-use crate::span::{Span, Spanned};
-use crate::token::{Token, TokenKind};
+use crate::{
+    span::{Span, Spanned},
+    token::{Token, TokenKind},
+};
 
 #[derive(Clone, Debug)]
 pub struct Ast(pub Spanned<Expr>);
diff --git a/src/parser.rs b/src/parser.rs
index b481d47..757c625 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -1,11 +1,10 @@
 use miette::SourceSpan;
 use paste::paste;
 
-use crate::ast::UnaryOp;
-use crate::span::Spanned;
 use crate::{
-    ast::{Ast, BinaryOp, Expr, Literal},
+    ast::{Ast, BinaryOp, Expr, Literal, UnaryOp},
     match_token::MatchToken,
+    span::Spanned,
     token::{Token, TokenKind},
 };
 
diff --git a/src/runners/repl.rs b/src/runners/repl.rs
index 308b9da..87e2ce5 100644
--- a/src/runners/repl.rs
+++ b/src/runners/repl.rs
@@ -1,9 +1,8 @@
 use std::io::{BufRead, Write};
 
-use crate::parser::parse;
 use miette::{IntoDiagnostic, Report, Result, WrapErr};
 
-use crate::scanner::scan;
+use crate::{parser::parse, scanner::scan};
 
 #[tracing::instrument]
 pub fn run_repl() -> Result<()> {
diff --git a/src/scanner.rs b/src/scanner.rs
index 431889f..1833df2 100644
--- a/src/scanner.rs
+++ b/src/scanner.rs
@@ -1,5 +1,7 @@
-use crate::span::Span;
-use crate::token::{Token, TokenKind};
+use crate::{
+    span::Span,
+    token::{Token, TokenKind},
+};
 
 type Result<T, E = ScannerError> = std::result::Result<T, E>;
 
diff --git a/src/span.rs b/src/span.rs
index ffae3c6..8da809f 100644
--- a/src/span.rs
+++ b/src/span.rs
@@ -1,5 +1,7 @@
-use std::fmt::{Debug, Display, Formatter};
-use std::ops::{Deref, DerefMut, Range};
+use std::{
+    fmt::{Debug, Display, Formatter},
+    ops::{Deref, DerefMut, Range},
+};
 
 use miette::SourceSpan;
 
-- 
2.51.2