only use env_logger in binaries (#3276)

starkware-libs · Jun 1, 2023 · 7cbc6cf · 7cbc6cf
1 parent 210b7ec
commit 7cbc6cf
Show file tree

Hide file tree

Showing 32 changed files with 272 additions and 69 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,6 +27,15 @@ members = [
     "crates/cairo-lang-syntax-codegen",
     "crates/cairo-lang-test-runner",
     "crates/cairo-lang-utils",
+    "crates/bin/cairo-language-server",
+    "crates/bin/cairo-compile",
+    "crates/bin/cairo-format",
+    "crates/bin/cairo-test",
+    "crates/bin/cairo-run",
+    "crates/bin/sierra-compile",
+    "crates/bin/starknet-compile",
+    "crates/bin/starknet-sierra-compile",
+    "crates/bin/generate-syntax",
     "tests",
 ]
 
@@ -85,7 +94,11 @@ test-case = "2.2.2"
 test-case-macros = "2.2.2"
 test-log = "0.2.11"
 thiserror = "1.0.32"
-time = { version = "0.3.20", features = ["formatting", "macros", "local-offset"] }
+time = { version = "0.3.20", features = [
+    "formatting",
+    "macros",
+    "local-offset",
+] }
 tokio = { version = "1.18.2", features = ["full", "sync"] }
 toml = "0.4.2"
 tower-lsp = "0.17.0"

diff --git a/crates/bin/cairo-compile/Cargo.toml b/crates/bin/cairo-compile/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "cairo-compile"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license-file.workspace = true
+
+[dependencies]
+anyhow.workspace = true
+clap.workspace = true
+log.workspace = true
+
+cairo-lang-compiler = { path = "../../cairo-lang-compiler" }
+cairo-lang-utils = { path = "../../cairo-lang-utils", features = [
+    "env_logger",
+] }
diff --git a/crates/cairo-lang-compiler/src/cli.rs → crates/bin/cairo-compile/src/main.rs b/crates/cairo-lang-compiler/src/cli.rs → crates/bin/cairo-compile/src/main.rs
diff --git a/crates/bin/cairo-format/Cargo.toml b/crates/bin/cairo-format/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "cairo-format"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license-file.workspace = true
+
+[dependencies]
+anyhow.workspace = true
+clap.workspace = true
+log.workspace = true
+colored.workspace = true
+ignore.workspace = true
+
+cairo-lang-formatter = { path = "../../cairo-lang-formatter" }
+cairo-lang-utils = { path = "../../cairo-lang-utils", features = [
+    "env_logger",
+] }
diff --git a/crates/cairo-lang-formatter/src/bin/cli.rs → crates/bin/cairo-format/src/main.rs b/crates/cairo-lang-formatter/src/bin/cli.rs → crates/bin/cairo-format/src/main.rs
diff --git a/crates/bin/cairo-language-server/Cargo.toml b/crates/bin/cairo-language-server/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "cairo-language-server"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license-file.workspace = true
+
+[dependencies]
+tokio.workspace = true
+log.workspace = true
+
+cairo-lang-language-server = { path = "../../cairo-lang-language-server" }
+cairo-lang-utils = { path = "../../cairo-lang-utils", features = [
+    "env_logger",
+] }
diff --git a/...anguage-server/src/bin/language_server.rs → crates/bin/cairo-language-server/src/main.rs b/...anguage-server/src/bin/language_server.rs → crates/bin/cairo-language-server/src/main.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/bin/cairo-run/Cargo.toml b/crates/bin/cairo-run/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "cairo-run"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license-file.workspace = true
+
+[dependencies]
+anyhow.workspace = true
+clap.workspace = true
+
+cairo-lang-runner = { path = "../../cairo-lang-runner" }
+cairo-lang-starknet = { path = "../../cairo-lang-starknet" }
+cairo-lang-diagnostics = { path = "../../cairo-lang-diagnostics" }
+cairo-lang-sierra = { path = "../../cairo-lang-sierra" }
+cairo-lang-sierra-generator = { path = "../../cairo-lang-sierra-generator" }
+cairo-lang-compiler = { path = "../../cairo-lang-compiler" }
+cairo-lang-utils = { path = "../../cairo-lang-utils", features = [
+    "env_logger",
+] }
diff --git a/crates/cairo-lang-runner/src/cli.rs → crates/bin/cairo-run/src/main.rs b/crates/cairo-lang-runner/src/cli.rs → crates/bin/cairo-run/src/main.rs
diff --git a/crates/bin/cairo-test/Cargo.toml b/crates/bin/cairo-test/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "cairo-test"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license-file.workspace = true
+
+[dependencies]
+anyhow.workspace = true
+clap.workspace = true
+
+cairo-lang-test-runner = { path = "../../cairo-lang-test-runner" }
diff --git a/crates/cairo-lang-test-runner/src/cli.rs → crates/bin/cairo-test/src/main.rs b/crates/cairo-lang-test-runner/src/cli.rs → crates/bin/cairo-test/src/main.rs
diff --git a/crates/bin/generate-syntax/Cargo.toml b/crates/bin/generate-syntax/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "generate-syntax"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license-file.workspace = true
+
+[dependencies]
+log.workspace = true
+
+cairo-lang-utils = { path = "../../cairo-lang-utils", features = [
+    "env_logger",
+] }
+cairo-lang-syntax-codegen = { path = "../../cairo-lang-syntax-codegen" }
diff --git a/...ang-syntax-codegen/src/generate_syntax.rs → crates/bin/generate-syntax/src/main.rs b/...ang-syntax-codegen/src/generate_syntax.rs → crates/bin/generate-syntax/src/main.rs
diff --git a/crates/bin/sierra-compile/Cargo.toml b/crates/bin/sierra-compile/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "sierra-compile"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license-file.workspace = true
+
+[dependencies]
+anyhow.workspace = true
+log.workspace = true
+clap.workspace = true
+indoc.workspace = true
+
+cairo-lang-sierra = { path = "../../cairo-lang-sierra" }
+cairo-lang-sierra-to-casm = { path = "../../cairo-lang-sierra-to-casm" }
+cairo-lang-utils = { path = "../../cairo-lang-utils", features = [
+    "env_logger",
+] }
diff --git a/crates/cairo-lang-sierra-to-casm/src/cli.rs → crates/bin/sierra-compile/src/main.rs b/crates/cairo-lang-sierra-to-casm/src/cli.rs → crates/bin/sierra-compile/src/main.rs
diff --git a/crates/bin/starknet-compile/Cargo.toml b/crates/bin/starknet-compile/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "starknet-compile"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license-file.workspace = true
+
+[dependencies]
+anyhow.workspace = true
+clap.workspace = true
+
+cairo-lang-compiler = { path = "../../cairo-lang-compiler" }
+cairo-lang-starknet = { path = "../../cairo-lang-starknet" }
diff --git a/crates/cairo-lang-starknet/src/cli.rs → crates/bin/starknet-compile/src/main.rs b/crates/cairo-lang-starknet/src/cli.rs → crates/bin/starknet-compile/src/main.rs