only use env_logger in binaries

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

Hide file tree

Showing 9 changed files with 34 additions and 16 deletions.
diff --git a/crates/cairo-lang-compiler/Cargo.toml b/crates/cairo-lang-compiler/Cargo.toml
@@ -29,6 +29,10 @@ thiserror.workspace = true
 [dev-dependencies]
 test-log.workspace = true
 
+[features]
+env_logger = ["cairo-lang-utils/env_logger"]
+
 [[bin]]
 name = "cairo-compile"
 path = "src/cli.rs"
+required-features = ["env_logger"]
diff --git a/crates/cairo-lang-formatter/Cargo.toml b/crates/cairo-lang-formatter/Cargo.toml
@@ -6,10 +6,6 @@ repository.workspace = true
 license-file.workspace = true
 description = "Cairo formatter."
 
-[[bin]]
-name = "cairo-format"
-path = "src/bin/cli.rs"
-
 [dependencies]
 anyhow.workspace = true
 cairo-lang-diagnostics = { path = "../cairo-lang-diagnostics", version = "1.1.0" }
@@ -27,7 +23,14 @@ salsa.workspace = true
 smol_str.workspace = true
 
 [dev-dependencies]
-cairo-lang-utils = { path = "../cairo-lang-utils", version = "1.1.0" }
 pretty_assertions.workspace = true
 test-case.workspace = true
 test-log.workspace = true
+
+[features]
+env_logger = ["cairo-lang-utils/env_logger"]
+
+[[bin]]
+name = "cairo-format"
+path = "src/bin/cli.rs"
+required-features = ["env_logger"]
diff --git a/crates/cairo-lang-language-server/Cargo.toml b/crates/cairo-lang-language-server/Cargo.toml
@@ -6,10 +6,6 @@ repository.workspace = true
 license-file.workspace = true
 description = "Cairo language server."
 
-[[bin]]
-name = "cairo-language-server"
-path = "src/bin/language_server.rs"
-
 [dependencies]
 anyhow.workspace = true
 cairo-lang-compiler = { path = "../cairo-lang-compiler", version = "1.1.0" }
@@ -39,3 +35,11 @@ tower-lsp.workspace = true
 
 [dev-dependencies]
 test-log.workspace = true
+
+[features]
+env_logger = ["cairo-lang-utils/env_logger"]
+
+[[bin]]
+name = "cairo-language-server"
+path = "src/bin/language_server.rs"
+required-features = ["env_logger"]
diff --git a/crates/cairo-lang-language-server/src/bin/language_server.rs b/crates/cairo-lang-language-server/src/bin/language_server.rs
@@ -1,6 +1,8 @@
 use cairo_lang_language_server::serve_language_service;
+use cairo_lang_utils::logging::init_logging;
 
 #[tokio::main]
 async fn main() {
+    init_logging(log::LevelFilter::Warn);
     serve_language_service().await;
 }
diff --git a/crates/cairo-lang-language-server/src/lib.rs b/crates/cairo-lang-language-server/src/lib.rs
@@ -42,7 +42,6 @@ use cairo_lang_syntax::node::kind::SyntaxKind;
 use cairo_lang_syntax::node::stable_ptr::SyntaxStablePtr;
 use cairo_lang_syntax::node::utils::is_grandparent_of_kind;
 use cairo_lang_syntax::node::{ast, SyntaxNode, TypedSyntaxNode};
-use cairo_lang_utils::logging::init_logging;
 use cairo_lang_utils::ordered_hash_set::OrderedHashSet;
 use cairo_lang_utils::{try_extract_matches, OptionHelper, Upcast};
 use log::warn;
@@ -69,8 +68,6 @@ pub mod vfs;
 const MAX_CRATE_DETECTION_DEPTH: usize = 20;
 
 pub async fn serve_language_service() {
-    init_logging(log::LevelFilter::Warn);
-
     #[cfg(feature = "runtime-agnostic")]
     use tokio_util::compat::{TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt};
 

diff --git a/crates/cairo-lang-sierra-to-casm/Cargo.toml b/crates/cairo-lang-sierra-to-casm/Cargo.toml
@@ -6,9 +6,6 @@ repository.workspace = true
 license-file.workspace = true
 description = "Emitting of CASM instructions from Sierra code."
 
-[features]
-testing = []
-
 [dependencies]
 anyhow.workspace = true
 assert_matches.workspace = true
@@ -33,6 +30,11 @@ pretty_assertions.workspace = true
 test-case.workspace = true
 test-log.workspace = true
 
+[features]
+testing = []
+env_logger = ["cairo-lang-utils/env_logger"]
+
 [[bin]]
 name = "sierra-compile"
 path = "src/cli.rs"
+required-features = ["env_logger"]
diff --git a/crates/cairo-lang-syntax-codegen/Cargo.toml b/crates/cairo-lang-syntax-codegen/Cargo.toml
@@ -19,6 +19,10 @@ xshell.workspace = true
 env_logger.workspace = true
 test-log.workspace = true
 
+[features]
+env_logger = ["cairo-lang-utils/env_logger"]
+
 [[bin]]
 name = "generate-syntax"
 path = "src/generate_syntax.rs"
+required-features = ["env_logger"]
diff --git a/crates/cairo-lang-utils/Cargo.toml b/crates/cairo-lang-utils/Cargo.toml
@@ -10,7 +10,6 @@ description = "General utilities for the Cairo compiler project."
 testing = []
 
 [dependencies]
-env_logger.workspace = true
 indexmap.workspace = true
 itertools.workspace = true
 log.workspace = true
@@ -19,8 +18,10 @@ num-integer.workspace = true
 num-traits.workspace = true
 serde.workspace = true
 time.workspace = true
+env_logger = { workspace = true, optional = true }
 
 [dev-dependencies]
 serde_json.workspace = true
 test-case.workspace = true
 test-log.workspace = true
+env_logger.workspace = true
diff --git a/crates/cairo-lang-utils/src/lib.rs b/crates/cairo-lang-utils/src/lib.rs
@@ -7,6 +7,7 @@ pub mod collection_arithmetics;
 pub mod extract_matches;
 pub mod graph_algos;
 pub mod iterators;
+#[cfg(feature = "env_logger")]
 pub mod logging;
 pub mod ordered_hash_map;
 pub mod ordered_hash_set;