Make git2 an optional dependency

trailofbits · Sep 20, 2021 · e5ce5b9 · e5ce5b9
1 parent bf51e0c
commit e5ce5b9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/cargo-dylint/Cargo.toml b/cargo-dylint/Cargo.toml
@@ -13,7 +13,7 @@ clap = "3.0.0-beta.4"
 env_logger = "0.9.0"
 
 dylint = { version = "=1.0.4", path = "../dylint", features = ["dylint_driver_local"] }
-dylint_internal = { version = "=1.0.4", path = "../internal" }
+dylint_internal = { version = "=1.0.4", path = "../internal", features = ["git2"] }
 
 [dev-dependencies]
 assert_cmd = "2.0.1"

diff --git a/examples/clippy/Cargo.toml b/examples/clippy/Cargo.toml
@@ -14,7 +14,7 @@ clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", tag = "rust-1
 clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", tag = "rust-1.54.0"}
 serde_json = "1.0.67"
 
-dylint_internal = { path = "../../internal" }
+dylint_internal = { path = "../../internal", features = ["git2"] }
 dylint_linting = { path = "../../utils/linting" }
 
 [dev-dependencies]

diff --git a/internal/Cargo.toml b/internal/Cargo.toml
@@ -10,7 +10,7 @@ repository = "https://github.com/trailofbits/dylint"
 [dependencies]
 anyhow = "1.0.44"
 cargo_metadata = "0.14.0"
-git2 = "0.13.22"
+git2 = { version = "0.13.22", optional = true }
 if_chain = "1.0.2"
 log = "0.4.14"
 sedregex = "0.2.4"
diff --git a/internal/src/lib.rs b/internal/src/lib.rs
@@ -11,7 +11,9 @@ pub mod examples;
 mod filename;
 pub use filename::library_filename;
 
+#[cfg(feature = "git2")]
 mod git;
+#[cfg(feature = "git2")]
 pub use git::*;
 
 pub mod path;
@@ -21,5 +23,7 @@ pub mod rustup;
 mod sed;
 pub use sed::find_and_replace;
 
+#[cfg(feature = "git2")]
 pub mod testing;
+#[cfg(feature = "git2")]
 pub use testing::checkout_dylint_template;