feat: Merges support crates for hc_data into hc_data (#40)

Merges more crates into `hc_data`: - `hc_git_command` - `hc_hash` Signed-off-by: Andrew Lilley Brinker <[email protected]> Co-authored-by: Andrew Lilley Brinker <[email protected]>
mitre · May 1, 2024 · b826128 · b826128
1 parent ccb554d
commit b826128
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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 → libs/hc_data/src/git_command.rs b/libs/hc_git_command/src/lib.rs → libs/hc_data/src/git_command.rs
diff --git a/libs/hc_hash/src/lib.rs → libs/hc_data/src/hash.rs b/libs/hc_hash/src/lib.rs → libs/hc_data/src/hash.rs
diff --git 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
@@ -4,14 +4,14 @@ mod query;
 
 pub use query::*;
 
+use crate::git_command::GitCommand;
 use hc_common::log::{self, debug};
 use hc_common::{
 	context::Context,
 	error::{Error, Result},
 	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
@@ -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
diff --git a/libs/hc_hash/Cargo.toml b/libs/hc_hash/Cargo.toml