From c3f4870b75ee7ecff217a3548231c3dc46dedc4f Mon Sep 17 00:00:00 2001 From: Joao Duarte Date: Mon, 11 Mar 2024 19:44:53 -0300 Subject: [PATCH] chore: Add logger as a workspace dependency --- Cargo.lock | 7 +++++++ Cargo.toml | 5 ++++- bin/Cargo.toml | 2 +- matching/Cargo.toml | 1 + matching_handlers/Cargo.toml | 1 + merge/Cargo.toml | 3 ++- model/Cargo.toml | 1 + parsing/Cargo.toml | 1 + 8 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2b41f98..31eda92 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -268,6 +268,7 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" name = "matching" version = "0.1.0" dependencies = [ + "log", "matching_handlers", "model", "unordered-pair", @@ -277,6 +278,7 @@ dependencies = [ name = "matching_handlers" version = "0.1.0" dependencies = [ + "log", "model", ] @@ -291,6 +293,7 @@ name = "merge" version = "0.1.0" dependencies = [ "diffy", + "log", "matching", "matching_handlers", "model", @@ -299,6 +302,9 @@ dependencies = [ [[package]] name = "model" version = "0.1.0" +dependencies = [ + "log", +] [[package]] name = "nu-ansi-term" @@ -320,6 +326,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" name = "parsing" version = "0.1.0" dependencies = [ + "log", "model", "tree-sitter", "tree-sitter-java", diff --git a/Cargo.toml b/Cargo.toml index 2721836..e2937eb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,4 +7,7 @@ members = [ "merge", "parsing", "model" -] \ No newline at end of file +] + +[workspace.dependencies] +log = "0.4.20" diff --git a/bin/Cargo.toml b/bin/Cargo.toml index 49ecf13..a95745a 100644 --- a/bin/Cargo.toml +++ b/bin/Cargo.toml @@ -13,7 +13,7 @@ matching = { path = "../matching" } matching_handlers = { path = "../matching_handlers" } assert_cmd = "2.0.12" clap = { version = "4.4.8", features = ["derive"] } -log = "0.4.20" +log = { workspace = true } env_logger = "0.10.1" [[bin]] diff --git a/matching/Cargo.toml b/matching/Cargo.toml index 4990693..26f95d6 100644 --- a/matching/Cargo.toml +++ b/matching/Cargo.toml @@ -9,3 +9,4 @@ edition = "2021" model = { path = "../model" } matching_handlers = { path = "../matching_handlers" } unordered-pair = "0.2.4" +log = { workspace = true } diff --git a/matching_handlers/Cargo.toml b/matching_handlers/Cargo.toml index fc2bed7..cf1a333 100644 --- a/matching_handlers/Cargo.toml +++ b/matching_handlers/Cargo.toml @@ -7,3 +7,4 @@ edition = "2021" [dependencies] model = { path = "../model" } +log = { workspace = true } diff --git a/merge/Cargo.toml b/merge/Cargo.toml index e4a53b7..cd74c8a 100644 --- a/merge/Cargo.toml +++ b/merge/Cargo.toml @@ -9,4 +9,5 @@ edition = "2021" model = { path = "../model" } matching = { path = "../matching" } matching_handlers = { path = "../matching_handlers" } -diffy = "0.3.0" \ No newline at end of file +diffy = "0.3.0" +log = { workspace = true } diff --git a/model/Cargo.toml b/model/Cargo.toml index 1d77457..8fd2197 100644 --- a/model/Cargo.toml +++ b/model/Cargo.toml @@ -6,3 +6,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +log = { workspace = true } diff --git a/parsing/Cargo.toml b/parsing/Cargo.toml index 1c14079..943f080 100644 --- a/parsing/Cargo.toml +++ b/parsing/Cargo.toml @@ -9,3 +9,4 @@ edition = "2021" tree-sitter = "0.20.9" tree-sitter-java = "0.20.0" model = { path = "../model" } +log = { workspace = true }