commit_id_types: remove dependency on derived data mappings

Summary: `scsc` still doesn't build on windows/mac due to transitive dependencies via `commit_id_types`.  However, this is only for the `Repo` trait alias, which is only used by `commit_id`.  Move the trait alias and its dependencies up to that crate.

Reviewed By: chiara125

Differential Revision: D75460985

fbshipit-source-id: ec5a5af9c5f003d04ec0137faf259ce911448d3b

Author: markbt

eden/mononoke/cmdlib/commit_id/BUCK

@@ -11,6 +11,10 @@ rust_library(
         "fbsource//third-party/rust:clap",
         "fbsource//third-party/rust:futures",
         "fbsource//third-party/rust:strum",
+        "//eden/mononoke/bonsai_git_mapping:bonsai_git_mapping",
+        "//eden/mononoke/bonsai_globalrev_mapping:bonsai_globalrev_mapping",
+        "//eden/mononoke/bonsai_hg_mapping:bonsai_hg_mapping",
+        "//eden/mononoke/bonsai_svnrev_mapping:bonsai_svnrev_mapping",
         "//eden/mononoke/bookmarks:bookmarks",
         "//eden/mononoke/cmdlib/commit_id_types:commit_id_types",
         "//eden/mononoke/mercurial:mercurial_types",

eden/mononoke/cmdlib/commit_id/Cargo.toml

@@ -12,6 +12,10 @@ path = "src/commit_id.rs"
 
 [dependencies]
 anyhow = "1.0.95"
+bonsai_git_mapping = { version = "0.1.0", path = "../../bonsai_git_mapping" }
+bonsai_globalrev_mapping = { version = "0.1.0", path = "../../bonsai_globalrev_mapping" }
+bonsai_hg_mapping = { version = "0.1.0", path = "../../bonsai_hg_mapping" }
+bonsai_svnrev_mapping = { version = "0.1.0", path = "../../bonsai_svnrev_mapping" }
 bookmarks = { version = "0.1.0", path = "../../bookmarks" }
 clap = { version = "4.5.38", features = ["derive", "env", "string", "unicode", "wrap_help"] }
 commit_id_types = { version = "0.1.0", path = "../commit_id_types" }

eden/mononoke/cmdlib/commit_id/src/commit_id.rs

@@ -11,6 +11,10 @@ use anyhow::Context;
 use anyhow::Error;
 use anyhow::Result;
 use anyhow::anyhow;
+use bonsai_git_mapping::BonsaiGitMappingRef;
+use bonsai_globalrev_mapping::BonsaiGlobalrevMappingRef;
+use bonsai_hg_mapping::BonsaiHgMappingRef;
+use bonsai_svnrev_mapping::BonsaiSvnrevMappingRef;
 use bookmarks::BookmarkKey;
 use bookmarks::BookmarksRef;
 use clap::ValueEnum;
@@ -26,6 +30,9 @@ use mononoke_types::Svnrev;
 use mononoke_types::hash::GitSha1;
 use strum::Display;
 
+pub trait Repo =
+    BonsaiHgMappingRef + BonsaiGitMappingRef + BonsaiGlobalrevMappingRef + BonsaiSvnrevMappingRef;
+
 #[derive(Copy, Clone, Eq, PartialEq, ValueEnum, Display)]
 #[strum(serialize_all = "kebab_case")]
 pub enum IdentityScheme {

eden/mononoke/cmdlib/commit_id_types/BUCK

@@ -10,9 +10,5 @@ rust_library(
         "fbsource//third-party/rust:anyhow",
         "fbsource//third-party/rust:clap",
         "fbsource//third-party/rust:faster-hex",
-        "//eden/mononoke/bonsai_git_mapping:bonsai_git_mapping",
-        "//eden/mononoke/bonsai_globalrev_mapping:bonsai_globalrev_mapping",
-        "//eden/mononoke/bonsai_hg_mapping:bonsai_hg_mapping",
-        "//eden/mononoke/bonsai_svnrev_mapping:bonsai_svnrev_mapping",
     ],
 )

eden/mononoke/cmdlib/commit_id_types/Cargo.toml

@@ -12,9 +12,5 @@ path = "src/commit_id_types.rs"
 
 [dependencies]
 anyhow = "1.0.95"
-bonsai_git_mapping = { version = "0.1.0", path = "../../bonsai_git_mapping" }
-bonsai_globalrev_mapping = { version = "0.1.0", path = "../../bonsai_globalrev_mapping" }
-bonsai_hg_mapping = { version = "0.1.0", path = "../../bonsai_hg_mapping" }
-bonsai_svnrev_mapping = { version = "0.1.0", path = "../../bonsai_svnrev_mapping" }
 clap = { version = "4.5.38", features = ["derive", "env", "string", "unicode", "wrap_help"] }
 faster-hex = "0.6.1"

eden/mononoke/cmdlib/commit_id_types/src/commit_id_types.rs

@@ -15,10 +15,6 @@ use std::num::NonZeroU64;
 
 use anyhow::Error;
 use anyhow::Result;
-use bonsai_git_mapping::BonsaiGitMappingRef;
-use bonsai_globalrev_mapping::BonsaiGlobalrevMappingRef;
-use bonsai_hg_mapping::BonsaiHgMappingRef;
-use bonsai_svnrev_mapping::BonsaiSvnrevMappingRef;
 use clap::Arg;
 use clap::ArgAction;
 use clap::ArgGroup;
@@ -37,9 +33,6 @@ pub(crate) const ARG_SVNREV: &str = "svnrev";
 pub(crate) const ARG_BUBBLE_ID: &str = "bubble-id";
 pub(crate) const ARG_SNAPSHOT_ID: &str = "snapshot-id";
 
-pub trait Repo =
-    BonsaiHgMappingRef + BonsaiGitMappingRef + BonsaiGlobalrevMappingRef + BonsaiSvnrevMappingRef;
-
 // Unfortunately we can't use clap derive API here directly because we care about
 // the order of arguments, but we still implement proper clap traits so that it
 // can be used in conjunction with derive API in other parts of the code.