From 25e855a009c47d30bfa4da93a93d8390df20fe45 Mon Sep 17 00:00:00 2001
From: mo8it <mo8it@proton.me>
Date: Mon, 8 Apr 2024 00:36:26 +0200
Subject: [PATCH] Merge imports

---
 src/exercise.rs | 23 ++++++++++++++---------
 src/main.rs     | 16 ++++++++--------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/exercise.rs b/src/exercise.rs
index c9fb3312..232d7f95 100644
--- a/src/exercise.rs
+++ b/src/exercise.rs
@@ -1,14 +1,19 @@
 use anyhow::{Context, Result};
 use serde::Deserialize;
-use std::fmt::{self, Debug, Display, Formatter};
-use std::fs::{self, File};
-use std::io::{self, BufRead, BufReader};
-use std::path::PathBuf;
-use std::process::{Command, Output};
-use std::{array, mem};
-use winnow::ascii::{space0, Caseless};
-use winnow::combinator::opt;
-use winnow::Parser;
+use std::{
+    array,
+    fmt::{self, Debug, Display, Formatter},
+    fs::{self, File},
+    io::{self, BufRead, BufReader},
+    mem,
+    path::PathBuf,
+    process::{Command, Output},
+};
+use winnow::{
+    ascii::{space0, Caseless},
+    combinator::opt,
+    Parser,
+};
 
 use crate::embedded::{WriteStrategy, EMBEDDED_FILES};
 
diff --git a/src/main.rs b/src/main.rs
index 3f10a8bd..cba525a1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,9 +1,6 @@
 use anyhow::{bail, Context, Result};
 use clap::{Parser, Subcommand};
-use state_file::StateFile;
-use std::path::Path;
-use std::process::exit;
-use verify::VerifyState;
+use std::{path::Path, process::exit};
 
 mod consts;
 mod embedded;
@@ -15,10 +12,13 @@ mod state_file;
 mod verify;
 mod watch;
 
-use crate::consts::WELCOME;
-use crate::exercise::{Exercise, InfoFile};
-use crate::run::run;
-use crate::verify::verify;
+use self::{
+    consts::WELCOME,
+    exercise::{Exercise, InfoFile},
+    run::run,
+    state_file::StateFile,
+    verify::{verify, VerifyState},
+};
 
 /// Rustlings is a collection of small exercises to get you used to writing and reading Rust code
 #[derive(Parser)]