From b4ba82116ac9063a0d842269bb747145d3851935 Mon Sep 17 00:00:00 2001
From: Yuji Mise <miseyu2000@gmail.com>
Date: Mon, 16 Sep 2024 12:03:32 +0900
Subject: [PATCH] chore(worker): Update Cargo.toml to use workspace
 dependencies for multiple crates (#498)

---
 worker/Cargo.lock                   | 80 ++++++++++++++++-------------
 worker/Cargo.toml                   | 36 ++++++++-----
 worker/crates/action-log/Cargo.toml |  6 +--
 worker/crates/cli/Cargo.toml        |  4 +-
 worker/crates/common/Cargo.toml     |  6 +--
 worker/crates/geometry/Cargo.toml   |  2 +-
 worker/crates/runtime/Cargo.toml    |  4 +-
 worker/crates/storage/Cargo.toml    |  2 +-
 8 files changed, 81 insertions(+), 59 deletions(-)

diff --git a/worker/Cargo.lock b/worker/Cargo.lock
index fd487c06c..0459cde46 100644
--- a/worker/Cargo.lock
+++ b/worker/Cargo.lock
@@ -2807,14 +2807,13 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
- "hermit-abi 0.3.9",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2995,6 +2994,16 @@ dependencies = [
  "libm",
 ]
 
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi 0.3.9",
+ "libc",
+]
+
 [[package]]
 name = "num_enum"
 version = "0.5.11"
@@ -3215,9 +3224,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "33ea5043e58958ee56f3e15a90aee535795cd7dfd319846288d93c5b57d85cbe"
 
 [[package]]
 name = "open"
@@ -3261,9 +3270,9 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c365a63eec4f55b7efeceb724f1336f26a9cf3427b70e59e2cd2a5b947fba96"
+checksum = "803801d3d3b71cd026851a53f974ea03df3d179cb758b260136a6c9e22e196af"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -3275,9 +3284,9 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-otlp"
-version = "0.17.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b925a602ffb916fb7421276b86756027b37ee708f9dce2dbdcc51739f07e727"
+checksum = "596b1719b3cab83addb20bcbffdf21575279d9436d9ccccfe651a3bf0ab5ab06"
 dependencies = [
  "async-trait",
  "futures-core",
@@ -3293,9 +3302,9 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-proto"
-version = "0.7.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9"
+checksum = "2c43620e8f93359eb7e627a3b16ee92d8585774986f24f2ab010817426c5ce61"
 dependencies = [
  "opentelemetry",
  "opentelemetry_sdk",
@@ -3305,15 +3314,15 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-semantic-conventions"
-version = "0.16.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cefe0543875379e47eb5f1e68ff83f45cc41366a92dfd0d073d513bf68e9a05"
+checksum = "9b8e442487022a943e2315740e443dc5ee95fd541c18f509a5a6251b408a9f95"
 
 [[package]]
 name = "opentelemetry-stdout"
-version = "0.5.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d408d4345b8be6129a77c46c3bfc75f0d3476f3091909c7dd99c1f3d78582287"
+checksum = "f76e2ded3f6e5d8b51e7aefc267022e7586975c00763aab70f807ad2cc156e94"
 dependencies = [
  "async-trait",
  "chrono",
@@ -3327,9 +3336,9 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry_sdk"
-version = "0.24.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692eac490ec80f24a17828d49b40b60f5aeaccdfe6a503f939713afd22bc28df"
+checksum = "e0da0d6b47a3dbc6e9c9e36a0520e25cf943e046843818faaa3f87365a548c82"
 dependencies = [
  "async-trait",
  "futures-channel",
@@ -3781,9 +3790,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
 [[package]]
 name = "pretty_assertions"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
 dependencies = [
  "diff",
  "yansi",
@@ -5021,9 +5030,9 @@ dependencies = [
 
 [[package]]
 name = "rust_xlsxwriter"
-version = "0.75.0"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35629615697da67299569fda0b93e7d79b7bd8cf2cc27b9f526f144e99f5a5af"
+checksum = "8391054b1f1f7b310e0d48359f6d439a3cb5de7afcb2d1ac861231a8e210c110"
 dependencies = [
  "zip",
 ]
@@ -5227,18 +5236,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6267,27 +6276,28 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
  "mio",
+ "num_cpus",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6509,9 +6519,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-opentelemetry"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9784ed4da7d921bc8df6963f8c80a0e4ce34ba6ba76668acadd3edbd985ff3b"
+checksum = "5eabc56d23707ad55ba2a0750fc24767125d5a0f51993ba41ad2c441cc7b8dea"
 dependencies = [
  "js-sys",
  "once_cell",
@@ -7569,9 +7579,9 @@ dependencies = [
 
 [[package]]
 name = "yansi"
-version = "0.5.1"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
 [[package]]
 name = "zerocopy"
diff --git a/worker/Cargo.toml b/worker/Cargo.toml
index c92cd06be..ca125bed5 100644
--- a/worker/Cargo.toml
+++ b/worker/Cargo.toml
@@ -74,12 +74,18 @@ cesiumtiles = { git = "https://github.com/reearth/cesiumtiles-rs.git" }
 Inflector = "0.11.4"
 ahash = "0.8.11"
 approx = "0.5.1"
+async-recursion = "1.1.1"
+async-stream = "0.3.5"
 async-trait = "0.1.82"
 async_zip = { version = "0.0.17", features = ["full"] }
+base64 = "0.22.1"
 byteorder = "1.5.0"
 bytes = { version = "1.7.1", features = ["serde"] }
 chrono = { version = "0.4.38", features = ["serde"] }
+clap = { version = "4.5.17", features = ["env", "string"] }
+clipper-sys = "0.7.2"
 color-eyre = "0.6.3"
+colored = "2.1.0"
 colorsys = "0.6.7"
 crossbeam = "0.8.4"
 csv = "1.3.0"
@@ -90,6 +96,7 @@ futures = "0.3.30"
 futures-util = "0.3.30"
 geojson = "0.24.1"
 hashbrown = "0.14.5"
+home = "0.5.9"
 image = { version = "0.25.2", default-features = false, features = ["jpeg", "png", "rayon", "tiff", "webp"] }
 indexmap = "2.5.0"
 indoc = "2.0.5"
@@ -101,44 +108,49 @@ nalgebra-glm = "0.19.0"
 num-traits = "0.2.19"
 nutype = { version = "0.5.0", features = ["schemars08", "serde"] }
 object_store = "0.11.0"
-once_cell = "1.19.0"
+once_cell = "1.20.0"
 opendal = { version = "0.49.2", features = ["layers-metrics", "services-fs", "services-gcs", "services-http"] }
-opentelemetry = { version = "0.24.0", default-features = false, features = ["metrics", "trace"] }
-opentelemetry-otlp = { version = "0.17.0", default-features = false, features = ["grpc-tonic", "metrics", "trace"] }
-opentelemetry-semantic-conventions = "0.16.0"
-opentelemetry-stdout = { version = "0.5.0", default-features = false, features = ["metrics", "trace"] }
-opentelemetry_sdk = { version = "0.24.1", default-features = false, features = ["metrics", "rt-tokio", "trace"] }
+opentelemetry = { version = "0.25.0", default-features = false, features = ["metrics", "trace"] }
+opentelemetry-otlp = { version = "0.25.0", default-features = false, features = ["grpc-tonic", "metrics", "trace"] }
+opentelemetry-semantic-conventions = "0.25.0"
+opentelemetry-stdout = { version = "0.25.0", default-features = false, features = ["metrics", "trace"] }
+opentelemetry_sdk = { version = "0.25.0", default-features = false, features = ["metrics", "rt-tokio", "trace"] }
 parking_lot = "0.12.3"
 petgraph = "0.6.5"
-pretty_assertions = "1.4.0"
+pretty_assertions = "1.4.1"
 quick-xml = "0.36.1"
 rand = "0.8.5"
 rayon = "1.10.0"
 regex = "1.10.6"
+reqwest = { version = "0.12.7", default-features = false, features = ["blocking", "rustls-tls"] }
 rhai = { version = "1.19.0", features = ["internals", "metadata", "serde", "sync"] }
+rmp-serde = "1.3.0"
 robust = "1.1.0"
 rstar = "0.12.0"
 rstest = "0.22.0"
-rust_xlsxwriter = "0.75.0"
+rust_xlsxwriter = "0.76.0"
 schemars = { version = "0.8.21", features = ["uuid1"] }
-serde = { version = "1.0.209", features = ["derive"] }
-serde_derive = "1.0.209"
+serde = { version = "1.0.210", features = ["derive"] }
+serde_derive = "1.0.210"
 serde_json = { version = "1.0.128", features = ["arbitrary_precision"] }
 serde_with = "3.9.0"
 serde_yaml = "0.9.34"
 sha2 = "0.10.8"
 slog = { version = "2.7.0", features = ["max_level_trace", "release_max_level_trace"] }
+slog-async = "2.8.0"
+slog-term = "2.9.1"
+sloggers = { version = "2.2.0", default-features = false }
 strum = "0.26.3"
 strum_macros = "0.26.4"
 tempfile = "3.12.0"
 thiserror = "1.0.63"
 time = { version = "0.3.36", features = ["formatting"] }
-tokio = { version = "1.40.0", features = ["full", "time"] }
+tokio = { version = "1.38.1", features = ["full", "time"] }
 tokio-stream = { version = "0.1.16", features = ["sync"] }
 tokio-util = { version = "0.7.12", features = ["full"] }
 toml = "0.8.19"
 tracing = "0.1.40"
-tracing-opentelemetry = { version = "0.25.0", default-features = false, features = ["metrics", "tracing-log"] }
+tracing-opentelemetry = { version = "0.26.0", default-features = false, features = ["metrics", "tracing-log"] }
 tracing-subscriber = { version = "0.3.18", features = [
   "env-filter",
   "std",
diff --git a/worker/crates/action-log/Cargo.toml b/worker/crates/action-log/Cargo.toml
index 5075c4c5b..5c3fac954 100644
--- a/worker/crates/action-log/Cargo.toml
+++ b/worker/crates/action-log/Cargo.toml
@@ -18,9 +18,9 @@ once_cell.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 slog.workspace = true
-slog-async = "2.8.0"
-slog-term = "2.9.1"
-sloggers = { version = "2.2.0", default-features = false }
+slog-async.workspace = true
+slog-term.workspace = true
+sloggers.workspace = true
 thiserror.workspace = true
 time.workspace = true
 tokio.workspace = true
diff --git a/worker/crates/cli/Cargo.toml b/worker/crates/cli/Cargo.toml
index d9c0a20ee..e23be3cad 100644
--- a/worker/crates/cli/Cargo.toml
+++ b/worker/crates/cli/Cargo.toml
@@ -31,8 +31,8 @@ reearth-flow-telemetry.workspace = true
 reearth-flow-types.workspace = true
 
 bytes.workspace = true
-clap = { version = "4.5.8", features = ["env", "string"] }
-colored = "2.1.0"
+clap.workspace = true
+colored.workspace = true
 directories.workspace = true
 indoc.workspace = true
 once_cell.workspace = true
diff --git a/worker/crates/common/Cargo.toml b/worker/crates/common/Cargo.toml
index 1c20ba8d1..8d7cdcd8d 100644
--- a/worker/crates/common/Cargo.toml
+++ b/worker/crates/common/Cargo.toml
@@ -12,13 +12,13 @@ version.workspace = true
 
 [dependencies]
 approx.workspace = true
-async-recursion = "1.1.1"
-base64 = "0.22.1"
+async-recursion.workspace = true
+base64.workspace = true
 bytes.workspace = true
 colorsys.workspace = true
 directories.workspace = true
 futures.workspace = true
-home = "0.5.9"
+home.workspace = true
 image.workspace = true
 jsonpath_lib.workspace = true
 libxml.workspace = true
diff --git a/worker/crates/geometry/Cargo.toml b/worker/crates/geometry/Cargo.toml
index 93116b4a2..5e37cb9a9 100644
--- a/worker/crates/geometry/Cargo.toml
+++ b/worker/crates/geometry/Cargo.toml
@@ -17,7 +17,7 @@ nusamai-projection.workspace = true
 
 approx.workspace = true
 bytes.workspace = true
-clipper-sys = "0.7.2"
+clipper-sys.workspace = true
 float_next_after.workspace = true
 geojson.workspace = true
 nalgebra.workspace = true
diff --git a/worker/crates/runtime/Cargo.toml b/worker/crates/runtime/Cargo.toml
index bf5ec44b5..3ef4c5287 100644
--- a/worker/crates/runtime/Cargo.toml
+++ b/worker/crates/runtime/Cargo.toml
@@ -18,7 +18,7 @@ reearth-flow-state.workspace = true
 reearth-flow-storage.workspace = true
 reearth-flow-types.workspace = true
 
-async-stream = "0.3.5"
+async-stream.workspace = true
 async-trait.workspace = true
 chrono.workspace = true
 crossbeam.workspace = true
@@ -31,7 +31,7 @@ parking_lot.workspace = true
 petgraph.workspace = true
 rayon.workspace = true
 regex.workspace = true
-rmp-serde = "1.3.0"
+rmp-serde.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
diff --git a/worker/crates/storage/Cargo.toml b/worker/crates/storage/Cargo.toml
index d2ad154a0..00aa289b0 100644
--- a/worker/crates/storage/Cargo.toml
+++ b/worker/crates/storage/Cargo.toml
@@ -17,7 +17,7 @@ object_store.workspace = true
 opendal.workspace = true
 parking_lot.workspace = true
 reearth-flow-common.workspace = true
-reqwest = { version = "0.12.5", default-features = false, features = ["blocking", "rustls-tls"] }
+reqwest.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 serde_with.workspace = true