Skip to content

Commit

Permalink
chore(worker): remove typetag.workspace from Cargo.toml files
Browse files Browse the repository at this point in the history
  • Loading branch information
miseyu committed Aug 5, 2024
1 parent 82fdcc3 commit 4d54d23
Show file tree
Hide file tree
Showing 8 changed files with 100 additions and 210 deletions.
246 changes: 72 additions & 174 deletions worker/Cargo.lock

Large diffs are not rendered by default.

37 changes: 18 additions & 19 deletions worker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,16 @@ reearth-flow-storage = {path = "crates/storage"}
reearth-flow-telemetry = {path = "crates/telemetry"}
reearth-flow-types = {path = "crates/types"}

nusamai-citygml = {git = "https://github.com/reearth/plateau-gis-converter", tag = "v0.0.1-rc1", features = ["serde", "serde_json"]}
nusamai-geometry = {git = "https://github.com/reearth/plateau-gis-converter", tag = "v0.0.1-rc1", features = ["serde"]}
nusamai-plateau = {git = "https://github.com/reearth/plateau-gis-converter", tag = "v0.0.1-rc1", features = ["serde"]}
nusamai-projection = {git = "https://github.com/reearth/plateau-gis-converter", tag = "v0.0.1-rc1"}
nusamai-citygml = {git = "https://github.com/reearth/plateau-gis-converter", tag = "v0.0.1-rc2", features = ["serde", "serde_json"]}
nusamai-geometry = {git = "https://github.com/reearth/plateau-gis-converter", tag = "v0.0.1-rc2", features = ["serde"]}
nusamai-plateau = {git = "https://github.com/reearth/plateau-gis-converter", tag = "v0.0.1-rc2", features = ["serde"]}
nusamai-projection = {git = "https://github.com/reearth/plateau-gis-converter", tag = "v0.0.1-rc2"}

Inflector = "0.11.4"
approx = "0.5.1"
async-trait = "0.1.81"
async_zip = {version = "0.0.17", features = ["full"]}
bytes = {version = "1.6.1", features = ["serde"]}
bytes = {version = "1.7.1", features = ["serde"]}
chrono = {version = "0.4.38", features = ["serde"]}
color-eyre = "0.6.3"
colorsys = "0.6.7"
Expand All @@ -74,60 +74,59 @@ float_next_after = "1.0.0"
futures = "0.3.30"
futures-util = "0.3.30"
hashbrown = "0.14.5"
indexmap = "2.2.6"
indexmap = "2.3.0"
indoc = "2.0.5"
itertools = "0.13.0"
jsonpath_lib = "0.3.0"
libxml = "0.3.3"
nalgebra = "0.33.0"
nalgebra-glm = "0.19.0"
num-traits = "0.2.19"
nutype = {version = "0.4.2", features = ["serde", "schemars08"]}
nutype = {version = "0.4.3", features = ["serde", "schemars08"]}
object_store = "0.10.2"
once_cell = "1.19.0"
opendal = {version = "0.47.3", features = ["layers-metrics", "services-fs", "services-gcs", "services-http"]}
opendal = {version = "0.48.0", features = ["layers-metrics", "services-fs", "services-gcs", "services-http"]}
opentelemetry = {version = "0.24.0", default-features = false, features = ["trace", "metrics"]}
opentelemetry-otlp = {version = "0.17.0", default-features = false, features = ["grpc-tonic", "trace", "metrics"]}
opentelemetry-semantic-conventions = "0.16.0"
opentelemetry-stdout = {version = "0.5.0", default-features = false, features = ["trace", "metrics"]}
opentelemetry_sdk = {version = "0.24.0", default-features = false, features = ["trace", "rt-tokio", "metrics"]}
opentelemetry_sdk = {version = "0.24.1", default-features = false, features = ["trace", "rt-tokio", "metrics"]}
parking_lot = "0.12.3"
petgraph = "0.6.5"
pretty_assertions = "1.4.0"
quick-xml = "0.36.0"
quick-xml = "0.36.1"
rand = "0.8.5"
rayon = "1.10.0"
regex = "1.10.5"
regex = "1.10.6"
rhai = {version = "1.19.0", features = ["internals", "sync", "serde", "metadata"]}
robust = "1.1.0"
rstar = "0.12.0"
rstest = "0.21.0"
rust_xlsxwriter = "0.70.0"
rstest = "0.22.0"
rust_xlsxwriter = "0.73.0"
schemars = {version = "0.8.21", features = ["uuid1"]}
serde = {version = "1.0.204", features = ["derive"]}
serde_derive = "1.0.204"
serde_json = {version = "1.0.120", features = ["arbitrary_precision"]}
serde_json = {version = "1.0.122", features = ["arbitrary_precision"]}
serde_with = "3.9.0"
serde_yaml = "0.9.34"
sha2 = "0.10.8"
slog = {version = "2.7.0", features = ["release_max_level_trace", "max_level_trace"]}
strum = "0.26.3"
strum_macros = "0.26.4"
tempfile = "3.10.1"
tempfile = "3.11.0"
thiserror = "1.0.63"
time = {version = "0.3.36", features = ["formatting"]}
tokio = {version = "1.38.1", features = ["full", "time"]}
tokio = {version = "1.39.2", features = ["full", "time"]}
tokio-stream = {version = "0.1.15", features = ["sync"]}
tokio-util = {version = "0.7.11", features = ["full"]}
toml = "0.8.14"
toml = "0.8.19"
tracing = "0.1.40"
tracing-opentelemetry = {version = "0.24.0", default-features = false, features = ["tracing-log", "metrics"]}
tracing-opentelemetry = {version = "0.25.0", default-features = false, features = ["tracing-log", "metrics"]}
tracing-subscriber = {version = "0.3.18", features = [
"env-filter",
"std",
"time",
]}
typetag = "0.2.16"
url = "2.5.2"
uuid = {version = "1.10.0", features = [
"v4",
Expand Down
1 change: 0 additions & 1 deletion worker/crates/action-plateau-processor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ thiserror.workspace = true
tokio.workspace = true
tracing-subscriber.workspace = true
tracing.workspace = true
typetag.workspace = true
url.workspace = true
uuid.workspace = true

Expand Down
1 change: 0 additions & 1 deletion worker/crates/action-processor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ thiserror.workspace = true
tokio.workspace = true
tracing-subscriber.workspace = true
tracing.workspace = true
typetag.workspace = true
url.workspace = true
uuid.workspace = true

Expand Down
1 change: 0 additions & 1 deletion worker/crates/action-sink/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ thiserror.workspace = true
tokio.workspace = true
tracing-subscriber.workspace = true
tracing.workspace = true
typetag.workspace = true
uuid.workspace = true

[dev-dependencies]
Expand Down
1 change: 0 additions & 1 deletion worker/crates/action-source/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ thiserror.workspace = true
tokio.workspace = true
tracing-subscriber.workspace = true
tracing.workspace = true
typetag.workspace = true
url.workspace = true
uuid.workspace = true

Expand Down
22 changes: 10 additions & 12 deletions worker/crates/storage/src/operator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,18 @@ pub(crate) fn build_operator<B: Builder>(builder: B) -> Result<Operator> {

/// init_fs_operator will init a opendal fs operator.
fn init_fs_operator(uri: &Uri) -> impl Builder {
let mut builder = services::Fs::default();
let builder = services::Fs::default();
let root = match uri.root() {
"" => "/",
_ => uri.root(),
};
builder.root(root);
builder
builder.root(root)
}

/// init_gcs_operator will init a opendal gcs operator.
fn init_gcs_operator(uri: &Uri) -> impl Builder {
let mut builder = services::Gcs::default();
builder.bucket(uri.root());
builder
let builder = services::Gcs::default();
builder.bucket(uri.root())
}

/// init_memory_operator will init a opendal memory operator.
Expand All @@ -66,17 +64,17 @@ fn init_memory_operator() -> impl Builder {
}

fn init_https_operator(uri: &Uri) -> impl Builder {
let mut builder = services::Http::default();
let builder = services::Http::default();
debug!("init_https_operator: {}", uri.root());
builder.endpoint(&format!("https://{}", uri.root()));
builder.root("/");
builder
.endpoint(&format!("https://{}", uri.root()))
.root("/")
}

fn init_http_operator(uri: &Uri) -> impl Builder {
let mut builder = services::Http::default();
let builder = services::Http::default();
debug!("init_http_operator: {}", uri.root());
builder.endpoint(&format!("http://{}", uri.root()));
builder.root("/");
builder
.endpoint(&format!("http://{}", uri.root()))
.root("/")
}
1 change: 0 additions & 1 deletion worker/crates/types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,4 @@ tokio-stream.workspace = true
tokio.workspace = true
tracing-subscriber.workspace = true
tracing.workspace = true
typetag.workspace = true
uuid.workspace = true

0 comments on commit 4d54d23

Please sign in to comment.