rely on os-checker-plugin crate v0.1.1

Cargo.toml

@@ -10,29 +10,19 @@ A plugin to os-checker to collect basic information from cargo and git.
 repository = "https://github.com/os-checker/plugin-cargo"
 
 [dependencies]
-jiff = "0.1"
-serde = { version = "1", features = ["derive"] }
-serde_json = { version = "1", features = ["preserve_order"] }
-
-compact_str = "0.8"
+plugin = { version = "0.1.1", package = "os-checker-plugin" }
 os-checker-types = "0.4.1"
 
-cargo_metadata  = "0.18"
-duct = "0.13"
+serde = "1"
+
 walkdir = "2"
 nextest-metadata = "0.12"
 
-camino = "1"
-indexmap = { version = "2", features = ["serde"] }
-
 # error handling
 eyre = "0.6"
-color-eyre = "0.6"
 
 # logger
 tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-tracing-error = "0.2"
 
 # The profile that 'dist' will build with
 [profile.dist]

src/crates_io/release_count.rs

@@ -1,5 +1,5 @@
-use crate::prelude::*;
 use cargo_metadata::semver::Version;
+use plugin::prelude::*;
 use serde::Deserialize;
 
 use super::release_tarball::TarballInfo;

src/crates_io/release_tarball.rs

@@ -1,7 +1,8 @@
 use super::IndexFile;
-use crate::{prelude::*, repo::local_base_dir};
+use crate::repo::local_base_dir;
 use cargo_metadata::semver::Version;
 use eyre::ContextCompat;
+use plugin::prelude::*;
 use std::os::linux::fs::MetadataExt;
 
 #[derive(Debug)]

src/database.rs

@@ -1,5 +1,5 @@
-use crate::prelude::*;
 use indexmap::Equivalent;
+use plugin::prelude::*;
 use serde::Deserialize;
 use std::{hash::Hash, sync::LazyLock};
 

src/lib.rs

@@ -1,26 +1,17 @@
-pub mod prelude {
-    pub use camino::{Utf8Path, Utf8PathBuf};
-    pub use cargo_metadata::Metadata;
-    pub use compact_str::CompactString as XString;
-    pub use eyre::{Context, Result};
-    pub use indexmap::IndexMap;
-    pub use jiff::Timestamp;
-}
-
 #[macro_use]
 extern crate eyre;
 #[macro_use]
 extern crate tracing;
 
+use plugin::prelude::*;
+
 pub mod crates_io;
 pub mod database;
-pub mod logger;
 pub mod nextest;
 pub mod repo;
 
 pub const BASE: &str = "tmp";
 
-use prelude::*;
 use std::fs;
 
 pub fn write_json<T: serde::Serialize>(path: &Utf8Path, val: &T) -> Result<()> {

src/main.rs

@@ -1,4 +1,5 @@
-use os_checker_plugin_cargo::{prelude::*, *};
+use os_checker_plugin_cargo::{repo, repos, write_json, BASE};
+use plugin::{logger, prelude::*};
 
 #[macro_use]
 extern crate tracing;

src/nextest/mod.rs

@@ -1,6 +1,6 @@
 //! Ref: https://github.com/nextest-rs/nextest/blob/cb67e450e0fa2803f0089ffc9189c34ecd355f13/nextest-runner/src/reporter/structured/libtest.rs#L116
-use crate::prelude::*;
 use indexmap::Equivalent;
+use plugin::prelude::*;
 use serde::{Deserialize, Serialize};
 use std::hash::Hash;
 

src/repo/mod.rs

@@ -1,7 +1,8 @@
-use crate::{crates_io::IndexFile, database::diag_total_count, prelude::*};
+use crate::{crates_io::IndexFile, database::diag_total_count};
 use cargo_metadata::Package;
 use eyre::ContextCompat;
 use output::Output;
+use plugin::prelude::*;
 use std::sync::LazyLock;
 use testcases::PkgTests;
 

src/repo/os_checker.rs

@@ -1,7 +1,6 @@
 use super::local_base_dir;
-use crate::prelude::*;
-use duct::cmd;
 use os_checker_types::layout::ListTargets;
+use plugin::prelude::*;
 
 pub type PkgTargets = IndexMap<XString, Vec<String>>;
 

src/repo/output.rs

@@ -1,5 +1,6 @@
 use super::testcases::TestCases;
 use cargo_metadata::Package;
+use plugin::prelude::*;
 use serde::Serialize;
 
 #[derive(Debug, Serialize)]

src/repo/testcases.rs

@@ -1,9 +1,6 @@
-use crate::{
-    nextest::{run_testcases, Event, Report},
-    prelude::*,
-};
+use crate::nextest::{run_testcases, Event, Report};
 use nextest_metadata::{RustTestSuiteSummary, TestListSummary};
-use serde::Serialize;
+use plugin::prelude::*;
 
 fn test_list(dir: &Utf8Path) -> Result<TestListSummary> {
     let mut command = nextest_metadata::ListCommand::new();