chore: cleanup crates & imports (#689)

Author: kaspar030

Cargo.lock

@@ -25,13 +25,11 @@ serde = "1.0.219"
 serde_derive = "1.0.215"
 serde_yaml = "0.9.34"
 shell-words = "1.1.0"
-simple-error = "0.3.1"
 treestate = "0.1.1"
 im = { version = "15.1.0", features = ["rayon", "serde"] }
 signal-hook = "0.3.17"
 mimalloc = { version = "0.1.44", default-features = false }
 build_uuid = "0.3.1"
-uuid = { version = "1.16.0", features = ["serde"] }
 solvent = { version = "0.8.3", features = ["deterministic"] }
 rust-embed = "8.6.0"
 task_partitioner = "0.1.1"

Cargo.toml

@@ -1,4 +1,4 @@
-use anyhow::{Context as _, Error, Result};
+use anyhow::{anyhow, Context as _, Error, Result};
 use im_rc::{HashMap, HashSet, Vector};
 use indexmap::{IndexMap, IndexSet};
 use itertools::Itertools;
@@ -11,7 +11,6 @@ pub struct Build<'a> {
     binary: Module,
     builder: &'a Context,
     pub build_context: Context,
-    //modules: IndexMap<&'a String, &'a Module>,
 }
 
 struct Resolver<'a, const VERBOSE: bool> {

src/build.rs

@@ -4,9 +4,6 @@
 //! This is intentionally separate from the main generate types in order to be a
 //! bit more flexible on changes to the format.
 
-extern crate pathdiff;
-extern crate serde_yaml;
-
 use indexmap::{IndexMap, IndexSet};
 use itertools::Itertools;
 use serde_yaml::Value;
@@ -17,7 +14,7 @@ use std::time::{Duration, Instant};
 use anyhow::{Context as _, Error, Result};
 use camino::{Utf8Path, Utf8PathBuf};
 use semver::Version;
-use serde::{Deserialize, Deserializer};
+use serde::{Deserialize, Deserializer, Serialize};
 
 use treestate::{FileState, TreeState};
 

src/data.rs

@@ -1,4 +1,4 @@
-use anyhow::Error;
+use anyhow::{anyhow, Error};
 use camino::{Utf8Path, Utf8PathBuf};
 use serde::{Deserialize, Serialize};
 

src/data/import.rs

@@ -1,4 +1,4 @@
-use anyhow::Context as _;
+use anyhow::{anyhow, Context as _};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Serialize, Deserialize, Hash)]

src/data/import/cmd.rs

@@ -1,6 +1,6 @@
 use std::fs::remove_dir_all;
 
-use anyhow::{Context as _, Error};
+use anyhow::{anyhow, Context as _, Error};
 use camino::{Utf8Path, Utf8PathBuf};
 use git_cache::GitCacheClonerBuilder;
 use rust_embed::RustEmbed;

src/data/import/download.rs

@@ -1,4 +1,4 @@
-use anyhow::{Context, Error};
+use anyhow::{anyhow, Context, Error};
 use camino::{Utf8Path, Utf8PathBuf};
 use serde::{Deserialize, Serialize};
 

src/data/import/local.rs

@@ -2,14 +2,14 @@
 
 use std::{borrow::Cow, path::Path};
 
-use anyhow::Result;
+use anyhow::{anyhow, Result};
+use camino::{Utf8Path, Utf8PathBuf};
 use im::HashMap;
 use indexmap::IndexMap;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 
 use super::{ninja::NinjaBuildBuilder, Module, Rule};
-use camino::{Utf8Path, Utf8PathBuf};
 
 pub mod source {
     use serde::{Deserialize, Serialize};

src/download.rs

@@ -10,12 +10,14 @@ use std::hash::Hasher;
 use std::io::prelude::*;
 use std::time::Instant;
 
-use anyhow::{Context as _, Result};
+use anyhow::{anyhow, Context as _, Result};
 use camino::{Utf8Path, Utf8PathBuf};
+use derive_builder::Builder;
 use im::Vector;
 use indexmap::{IndexMap, IndexSet};
 use itertools::Itertools;
 use rayon::prelude::*;
+use serde::{Deserialize, Serialize};
 use solvent::DepGraph;
 
 use crate::{

src/generate.rs

@@ -1,5 +1,6 @@
 use camino::Utf8PathBuf;
 use indexmap::IndexMap;
+use serde::{Deserialize, Serialize};
 
 use crate::generate::{BuildInfo, ModuleInfo};
 

src/insights.rs

@@ -1,25 +1,9 @@
-#[macro_use]
-extern crate anyhow;
-extern crate clap;
-
-#[macro_use]
-extern crate simple_error;
-
-#[macro_use]
-extern crate derive_builder;
-
-extern crate pathdiff;
-
 use core::sync::atomic::AtomicBool;
-
 use std::env;
 use std::str;
 use std::sync::{Arc, OnceLock};
 
-#[macro_use]
-extern crate serde_derive;
-
-use anyhow::{Context as _, Error, Result};
+use anyhow::{anyhow, Context as _, Error, Result};
 use camino::{Utf8Path, Utf8PathBuf};
 use git_cache::GitCache;
 use indexmap::IndexSet;
@@ -157,9 +141,12 @@ fn try_main() -> Result<i32> {
             return Ok(0);
         }
         Some(("completion", matches)) => {
-            fn print_completions<G: clap_complete::Generator>(gen: G, cmd: &mut clap::Command) {
+            fn print_completions<G: clap_complete::Generator>(
+                generator: G,
+                cmd: &mut clap::Command,
+            ) {
                 clap_complete::generate(
-                    gen,
+                    generator,
                     cmd,
                     cmd.get_name().to_string(),
                     &mut std::io::stdout(),

src/main.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 use std::{iter::Filter, slice::Iter};
 
-use anyhow::Error;
+use anyhow::{anyhow, Error};
 use indexmap::IndexSet;
 
 use super::{BlockAllow, Context, Module};

src/model/context_bag.rs

@@ -1,5 +1,7 @@
 use std::fmt::Display;
 
+use serde::{Deserialize, Serialize};
+
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
 pub enum Dependency<T>
 where

src/model/dependency.rs

@@ -5,6 +5,7 @@ use std::hash::{Hash, Hasher};
 use anyhow::Error;
 use camino::{Utf8Path, Utf8PathBuf};
 use indexmap::{indexset, IndexMap, IndexSet};
+use serde::{Deserialize, Serialize};
 
 use crate::build::ResolverResult;
 use crate::download;

src/model/module.rs

@@ -3,6 +3,8 @@ use std::collections::HashMap;
 use std::convert::From;
 use std::hash::{Hash, Hasher};
 
+use serde::{Deserialize, Serialize};
+
 use crate::serde_bool_helpers::default_as_false;
 
 #[derive(Debug, Serialize, Deserialize, Eq, Clone)]

src/model/rule.rs

@@ -1,3 +1,5 @@
+use serde::{Deserialize, Serialize};
+
 use crate::nested_env;
 
 #[derive(Debug, Serialize, Deserialize, Eq, PartialEq, Clone)]

src/model/shared.rs

@@ -1,8 +1,9 @@
 use std::ffi::OsStr;
 use std::path::Path;
 
-use anyhow::{Error, Result};
+use anyhow::{anyhow, Error, Result};
 use itertools::Itertools;
+use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
 use crate::nested_env;

src/model/task.rs

@@ -1,7 +1,8 @@
-use anyhow::{Context, Error};
+use anyhow::{anyhow, Context, Error};
 use evalexpr::EvalexprError;
 use im::{hashmap::Entry, vector, HashMap, Vector};
 use itertools::join;
+use serde::{Deserialize, Serialize};
 
 mod expand;
 mod expr;

src/nested_env/mod.rs

@@ -7,6 +7,7 @@ use std::hash::{Hash, Hasher};
 use std::process::{Command, ExitStatus, Stdio};
 
 use camino::{Utf8Path, Utf8PathBuf};
+use derive_builder::Builder;
 use indexmap::IndexMap;
 
 use crate::model::VarExportSpec;

src/ninja/mod.rs

@@ -3,6 +3,7 @@ use std::hash::{Hash, Hasher};
 
 use camino::Utf8PathBuf;
 use indexmap::IndexMap;
+use serde::{Deserialize, Serialize};
 
 use crate::model::VarExportSpec;