diff --git a/Cargo.lock b/Cargo.lock index e017a8d1..725cde2a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -679,8 +679,6 @@ dependencies = [ "graphql_client", "hc_common", "hc_config", - "hc_git_command", - "hc_hash", "hc_serde", "hc_shell", "hc_version", @@ -690,17 +688,6 @@ dependencies = [ "ureq", ] -[[package]] -name = "hc_git_command" -version = "0.1.0" -dependencies = [ - "hc_common", -] - -[[package]] -name = "hc_hash" -version = "0.1.0" - [[package]] name = "hc_linguist" version = "0.1.0" diff --git a/libs/hc_data/Cargo.toml b/libs/hc_data/Cargo.toml index 7857370f..c338b195 100644 --- a/libs/hc_data/Cargo.toml +++ b/libs/hc_data/Cargo.toml @@ -10,8 +10,6 @@ dirs = "5.0.1" graphql_client = "0.14.0" hc_common = { path = "../hc_common" } hc_config = { path = "../hc_config" } -hc_git_command = { path = "../hc_git_command" } -hc_hash = { path = "../hc_hash" } hc_shell = { path = "../hc_shell" } hc_version = { path = "../hc_version" } nom = "7.1.3" diff --git a/libs/hc_data/src/git/mod.rs b/libs/hc_data/src/git/mod.rs index 17054e16..b7fef0bb 100644 --- a/libs/hc_data/src/git/mod.rs +++ b/libs/hc_data/src/git/mod.rs @@ -5,10 +5,10 @@ pub mod parse; mod query; pub use data::*; -pub use hc_git_command::*; use parse::*; pub use query::*; +pub use crate::git_command::*; use hc_common::context::Context as _; use hc_common::{ error::{Error, Result}, diff --git a/libs/hc_git_command/src/lib.rs b/libs/hc_data/src/git_command.rs similarity index 100% rename from libs/hc_git_command/src/lib.rs rename to libs/hc_data/src/git_command.rs diff --git a/libs/hc_hash/src/lib.rs b/libs/hc_data/src/hash.rs similarity index 100% rename from libs/hc_hash/src/lib.rs rename to libs/hc_data/src/hash.rs diff --git a/libs/hc_data/src/lib.rs b/libs/hc_data/src/lib.rs index 4b59d2a7..4ba6f471 100644 --- a/libs/hc_data/src/lib.rs +++ b/libs/hc_data/src/lib.rs @@ -5,7 +5,9 @@ mod code_quality; mod es_lint; pub mod git; +pub mod git_command; mod github; +mod hash; mod modules; pub mod npm; mod query; diff --git a/libs/hc_data/src/source/mod.rs b/libs/hc_data/src/source/mod.rs index c4e9a220..907ef2ce 100644 --- a/libs/hc_data/src/source/mod.rs +++ b/libs/hc_data/src/source/mod.rs @@ -4,6 +4,7 @@ mod query; pub use query::*; +use crate::git_command::GitCommand; use hc_common::log::{self, debug}; use hc_common::{ context::Context, @@ -11,7 +12,6 @@ use hc_common::{ hc_error, pathbuf, url::Url, }; -use hc_git_command::GitCommand; use hc_shell::Phase; use std::ffi::OsStr; use std::fmt::{self, Debug, Display, Formatter}; diff --git a/libs/hc_data/src/source/query.rs b/libs/hc_data/src/source/query.rs index 79ae11bf..ab2dc86f 100644 --- a/libs/hc_data/src/source/query.rs +++ b/libs/hc_data/src/source/query.rs @@ -2,9 +2,11 @@ //! A query group for accessing Git repository data. -use crate::source::{Remote, Source}; +use crate::{ + hash, + source::{Remote, Source}, +}; use hc_common::{pathbuf, salsa}; -use hc_hash::hash; use std::path::PathBuf; use std::rc::Rc; diff --git a/libs/hc_git_command/Cargo.toml b/libs/hc_git_command/Cargo.toml deleted file mode 100644 index 34c7a11c..00000000 --- a/libs/hc_git_command/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "hc_git_command" -version = "0.1.0" -edition = "2021" -license = "Apache-2.0" -publish = false - -[dependencies] -hc_common = { path = "../hc_common" } diff --git a/libs/hc_hash/Cargo.toml b/libs/hc_hash/Cargo.toml deleted file mode 100644 index 180845ac..00000000 --- a/libs/hc_hash/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "hc_hash" -version = "0.1.0" -edition = "2021" -license = "Apache-2.0" -publish = false - -[dependencies] -