fix udeps warnings

starkware-libs · May 30, 2023 · 059cdc1 · 059cdc1
1 parent 9b308a6
commit 059cdc1
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 21 deletions.
diff --git a/crates/cairo-lang-compiler/Cargo.toml b/crates/cairo-lang-compiler/Cargo.toml
@@ -20,19 +20,21 @@ cairo-lang-sierra = { path = "../cairo-lang-sierra", version = "1.1.0" }
 cairo-lang-sierra-generator = { path = "../cairo-lang-sierra-generator", version = "1.1.0" }
 cairo-lang-syntax = { path = "../cairo-lang-syntax", version = "1.1.0" }
 cairo-lang-utils = { path = "../cairo-lang-utils", version = "1.1.0" }
-clap.workspace = true
 log.workspace = true
 salsa.workspace = true
 smol_str.workspace = true
 thiserror.workspace = true
 
+# Optional
+clap = { workspace = true, optional = true }
+
 [dev-dependencies]
 test-log.workspace = true
 
 [features]
-env_logger = ["cairo-lang-utils/env_logger"]
+binary = ["cairo-lang-utils/env_logger", "dep:clap"]
 
 [[bin]]
 name = "cairo-compile"
 path = "src/cli.rs"
-required-features = ["env_logger"]
+required-features = ["binary"]
diff --git a/crates/cairo-lang-formatter/Cargo.toml b/crates/cairo-lang-formatter/Cargo.toml
@@ -13,7 +13,6 @@ cairo-lang-filesystem = { path = "../cairo-lang-filesystem", version = "1.1.0" }
 cairo-lang-parser = { path = "../cairo-lang-parser", version = "1.1.0" }
 cairo-lang-syntax = { path = "../cairo-lang-syntax", version = "1.1.0" }
 cairo-lang-utils = { path = "../cairo-lang-utils", version = "1.1.0" }
-clap.workspace = true
 colored.workspace = true
 diffy.workspace = true
 ignore.workspace = true
@@ -22,15 +21,18 @@ log.workspace = true
 salsa.workspace = true
 smol_str.workspace = true
 
+# Optional
+clap = { workspace = true, optional = true }
+
 [dev-dependencies]
 pretty_assertions.workspace = true
 test-case.workspace = true
 test-log.workspace = true
 
 [features]
-env_logger = ["cairo-lang-utils/env_logger"]
+binary = ["cairo-lang-utils/env_logger", "dep:clap"]
 
 [[bin]]
 name = "cairo-format"
 path = "src/bin/cli.rs"
-required-features = ["env_logger"]
+required-features = ["binary"]
diff --git a/crates/cairo-lang-sierra-to-casm/Cargo.toml b/crates/cairo-lang-sierra-to-casm/Cargo.toml
@@ -7,22 +7,24 @@ license-file.workspace = true
 description = "Emitting of CASM instructions from Sierra code."
 
 [dependencies]
-anyhow.workspace = true
 assert_matches.workspace = true
 cairo-felt.workspace = true
 cairo-lang-casm = { path = "../cairo-lang-casm", version = "1.1.0" }
 cairo-lang-sierra = { path = "../cairo-lang-sierra", version = "1.1.0" }
 cairo-lang-sierra-ap-change = { path = "../cairo-lang-sierra-ap-change", version = "1.1.0" }
 cairo-lang-sierra-gas = { path = "../cairo-lang-sierra-gas", version = "1.1.0" }
 cairo-lang-utils = { path = "../cairo-lang-utils", version = "1.1.0" }
-clap.workspace = true
 indoc.workspace = true
 itertools.workspace = true
 log.workspace = true
 num-bigint.workspace = true
 num-traits.workspace = true
 thiserror.workspace = true
 
+# Optional
+clap = { workspace = true, optional = true }
+anyhow = { workspace = true, optional = true }
+
 [dev-dependencies]
 env_logger.workspace = true
 indoc.workspace = true
@@ -32,9 +34,9 @@ test-log.workspace = true
 
 [features]
 testing = []
-env_logger = ["cairo-lang-utils/env_logger"]
+binary = ["cairo-lang-utils/env_logger", "dep:clap", "dep:anyhow"]
 
 [[bin]]
 name = "sierra-compile"
 path = "src/cli.rs"
-required-features = ["env_logger"]
+required-features = ["binary"]
diff --git a/crates/cairo-lang-syntax-codegen/Cargo.toml b/crates/cairo-lang-syntax-codegen/Cargo.toml
@@ -10,19 +10,21 @@ description = "Cairo syntax code generation."
 normal = ["cairo-lang-syntax"]
 
 [dependencies]
-cairo-lang-utils = { path = "../cairo-lang-utils", version = "1.1.0" }
 genco.workspace = true
-log.workspace = true
 xshell.workspace = true
 
+# Optional
+cairo-lang-utils = { path = "../cairo-lang-utils", version = "1.1.0", optional = true }
+log = { workspace = true, optional = true }
+
 [dev-dependencies]
 env_logger.workspace = true
 test-log.workspace = true
 
 [features]
-env_logger = ["cairo-lang-utils/env_logger"]
+binary = ["cairo-lang-utils/env_logger", "dep:log"]
 
 [[bin]]
 name = "generate-syntax"
 path = "src/generate_syntax.rs"
-required-features = ["env_logger"]
+required-features = ["binary"]
diff --git a/crates/cairo-lang-test-utils/Cargo.toml b/crates/cairo-lang-test-utils/Cargo.toml
@@ -9,8 +9,8 @@ description = "Utilities for writing tests in the Cairo compiler project."
 [dependencies]
 cairo-lang-utils = { path = "../cairo-lang-utils", version = "1.1.0" }
 log.workspace = true
-env_logger.workspace = true
 pretty_assertions.workspace = true
 
 [dev-dependencies]
 test-log.workspace = true
+env_logger.workspace = true
diff --git a/crates/cairo-lang-utils/Cargo.toml b/crates/cairo-lang-utils/Cargo.toml
@@ -6,22 +6,25 @@ repository.workspace = true
 license-file.workspace = true
 description = "General utilities for the Cairo compiler project."
 
-[features]
-testing = []
-
 [dependencies]
 indexmap.workspace = true
 itertools.workspace = true
-log.workspace = true
 num-bigint.workspace = true
 num-integer.workspace = true
 num-traits.workspace = true
 serde.workspace = true
-time.workspace = true
+
+# Optional
 env_logger = { workspace = true, optional = true }
+time = { workspace = true, optional = true }
+log = { workspace = true, optional = true }
 
 [dev-dependencies]
 serde_json.workspace = true
 test-case.workspace = true
 test-log.workspace = true
 env_logger.workspace = true
+
+[features]
+testing = []
+env_logger = ["dep:env_logger", "dep:time", "dep:log"]
diff --git a/scripts/cairo_fmt.sh b/scripts/cairo_fmt.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-cargo run --bin cairo-format -- --recursive "$@"
+cargo run --bin cairo-format --features="binary" -- --recursive "$@"