From 075cac1e427653e1af4269fc0e7e1a517950e986 Mon Sep 17 00:00:00 2001 From: Lars Baumgaertner <1264131+gh0st42@users.noreply.github.com> Date: Tue, 27 Feb 2024 11:55:51 +0000 Subject: [PATCH] chore: updated dtn7-codegen crates dependencies and bumped version to v0.1.1 --- Cargo.lock | 73 ++++++++++++++++++++++++++--------------- Cargo.toml | 1 + core/codegen/Cargo.toml | 6 ++-- core/dtn7/Cargo.toml | 7 ++-- 4 files changed, 54 insertions(+), 33 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 06fdfa00..e56e9b65 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -91,6 +91,28 @@ version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.51", +] + [[package]] name = "async-trait" version = "0.1.77" @@ -389,10 +411,11 @@ dependencies = [ [[package]] name = "console-api" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" +checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" dependencies = [ + "futures-core", "prost", "prost-types", "tonic", @@ -401,14 +424,14 @@ dependencies = [ [[package]] name = "console-subscriber" -version = "0.1.10" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb" +checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e" dependencies = [ "console-api", "crossbeam-channel", "crossbeam-utils", - "futures", + "futures-task", "hdrhistogram", "humantime", "parking_lot 0.12.1", @@ -588,7 +611,6 @@ dependencies = [ "base64 0.21.7", "bitflags 2.4.2", "bp7", - "byteorder", "bytes", "clap", "config", @@ -633,11 +655,11 @@ dependencies = [ [[package]] name = "dtn7-codegen" -version = "0.1.0" +version = "0.1.1" dependencies = [ "lazy_static", "quote", - "syn 1.0.109", + "syn 2.0.51", ] [[package]] @@ -1205,9 +1227,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] @@ -1358,13 +1380,13 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.3.3" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.51", ] [[package]] @@ -1539,9 +1561,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.9" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", "prost-derive", @@ -1549,22 +1571,22 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.9" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", "itertools", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.51", ] [[package]] name = "prost-types" -version = "0.11.9" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" dependencies = [ "prost", ] @@ -2081,9 +2103,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", @@ -2292,16 +2314,15 @@ dependencies = [ [[package]] name = "tonic" -version = "0.9.2" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" +checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" dependencies = [ + "async-stream", "async-trait", "axum 0.6.20", "base64 0.21.7", "bytes", - "futures-core", - "futures-util", "h2", "http 0.2.11", "http-body", diff --git a/Cargo.toml b/Cargo.toml index 64414805..3216084a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,7 @@ strip = true # Automatically strip symbols from the binary. [workspace] +resolver = "2" members = [ "core/codegen", diff --git a/core/codegen/Cargo.toml b/core/codegen/Cargo.toml index 6a906b2b..cd6a0e19 100644 --- a/core/codegen/Cargo.toml +++ b/core/codegen/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "dtn7-codegen" -version = "0.1.0" +version = "0.1.1" edition = "2021" authors = ["Lars Baumgaertner "] -description = "codgen helpers for dtn7-rs" +description = "codegen helpers for dtn7-rs" license = "MIT OR Apache-2.0" categories = ["command-line-utilities", "network-programming"] repository = "https://github.com/dtn7/dtn7-rs" @@ -15,6 +15,6 @@ readme = "README.md" proc-macro = true [dependencies] -syn = {version="1.0.57",features=["full","fold"]} +syn = {version="2.0.51",features=["full","fold"]} quote = "1.0.8" lazy_static = "1.4.0" diff --git a/core/dtn7/Cargo.toml b/core/dtn7/Cargo.toml index 39e44f6a..602d7d17 100644 --- a/core/dtn7/Cargo.toml +++ b/core/dtn7/Cargo.toml @@ -36,7 +36,7 @@ tokio = { version = "1.36.0", features = [ "time", "tracing", ] } -console-subscriber = { version = "0.1.6", features = [ +console-subscriber = { version = "0.2.0", features = [ "parking_lot", ], optional = true } tokio-util = { version = "0.7.10", features = ["codec"] } @@ -70,11 +70,10 @@ hyper = { version = "0.14.18", features = ["client"] } tungstenite = "0.17.3" #measure_time = "0.7.0" bitflags = "2.0.2" -num-derive = "0.3.3" +num-derive = "0.4.2" num-traits = "0.2.15" thiserror = "1.0.31" -dtn7-codegen = { path = "../codegen", version = "0.1.0" } -byteorder = "1.4.3" +dtn7-codegen = { path = "../codegen", version = "0.1.1" } reqwest = { version = "0.11.13", default-features = false, features = ["json"] } sha1 = "0.10.5" glob-match = "0.2.1"