Merge imports

This commit is contained in:
mo8it 2024-04-08 00:36:26 +02:00
parent c2501ae733
commit 25e855a009
2 changed files with 22 additions and 17 deletions

View file

@ -1,14 +1,19 @@
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use serde::Deserialize; use serde::Deserialize;
use std::fmt::{self, Debug, Display, Formatter}; use std::{
use std::fs::{self, File}; array,
use std::io::{self, BufRead, BufReader}; fmt::{self, Debug, Display, Formatter},
use std::path::PathBuf; fs::{self, File},
use std::process::{Command, Output}; io::{self, BufRead, BufReader},
use std::{array, mem}; mem,
use winnow::ascii::{space0, Caseless}; path::PathBuf,
use winnow::combinator::opt; process::{Command, Output},
use winnow::Parser; };
use winnow::{
ascii::{space0, Caseless},
combinator::opt,
Parser,
};
use crate::embedded::{WriteStrategy, EMBEDDED_FILES}; use crate::embedded::{WriteStrategy, EMBEDDED_FILES};

View file

@ -1,9 +1,6 @@
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
use clap::{Parser, Subcommand}; use clap::{Parser, Subcommand};
use state_file::StateFile; use std::{path::Path, process::exit};
use std::path::Path;
use std::process::exit;
use verify::VerifyState;
mod consts; mod consts;
mod embedded; mod embedded;
@ -15,10 +12,13 @@ mod state_file;
mod verify; mod verify;
mod watch; mod watch;
use crate::consts::WELCOME; use self::{
use crate::exercise::{Exercise, InfoFile}; consts::WELCOME,
use crate::run::run; exercise::{Exercise, InfoFile},
use crate::verify::verify; 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 /// Rustlings is a collection of small exercises to get you used to writing and reading Rust code
#[derive(Parser)] #[derive(Parser)]