From 752558980bc5c8d4792a9743a50340e8a9c0e804 Mon Sep 17 00:00:00 2001 From: Pradip Caulagi Date: Fri, 6 Oct 2023 11:34:42 +0200 Subject: [PATCH] Update dependencies and bump rustc to 1.73 --- Cargo.lock | 96 ++++++++++++------------------------- frontendservice/Cargo.toml | 8 ++-- frontendservice/Dockerfile | 2 +- quotationservice/Cargo.toml | 10 ++-- quotationservice/Dockerfile | 2 +- 5 files changed, 41 insertions(+), 77 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 29da1e2d..7211f850 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -51,7 +51,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn", ] [[package]] @@ -62,7 +62,7 @@ checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn", ] [[package]] @@ -291,7 +291,7 @@ version = "0.1.0" dependencies = [ "axum", "bytes", - "prost 0.11.9", + "prost", "tokio", "tonic", "tonic-build", @@ -326,7 +326,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn", ] [[package]] @@ -750,7 +750,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn", ] [[package]] @@ -807,7 +807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ "proc-macro2", - "syn 2.0.28", + "syn", ] [[package]] @@ -819,16 +819,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - [[package]] name = "prost" version = "0.12.1" @@ -836,7 +826,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" dependencies = [ "bytes", - "prost-derive 0.12.1", + "prost-derive", ] [[package]] @@ -853,27 +843,14 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost 0.12.1", + "prost", "prost-types", "regex", - "syn 2.0.28", + "syn", "tempfile", "which", ] -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "prost-derive" version = "0.12.1" @@ -884,7 +861,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 2.0.28", + "syn", ] [[package]] @@ -893,7 +870,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf" dependencies = [ - "prost 0.12.1", + "prost", ] [[package]] @@ -901,7 +878,7 @@ name = "quotation-server" version = "0.1.0" dependencies = [ "bytes", - "prost 0.11.9", + "prost", "tokio", "tokio-postgres", "tonic", @@ -1042,9 +1019,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", @@ -1221,17 +1198,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.28" @@ -1289,18 +1255,17 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.5.3", "tokio-macros", "windows-sys", ] @@ -1323,7 +1288,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn", ] [[package]] @@ -1389,17 +1354,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", "base64", "bytes", - "futures-core", - "futures-util", "h2", "http", "http-body", @@ -1407,7 +1370,8 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.11.9", + "prost", + "rustls", "rustls-pemfile", "tokio", "tokio-rustls", @@ -1420,15 +1384,15 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d37bb15da06ae9bb945963066baca6561b505af93a52e949a85d28558459a2" +checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ "prettyplease", "proc-macro2", "prost-build", "quote", - "syn 2.0.28", + "syn", ] [[package]] @@ -1453,9 +1417,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" +checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ "bitflags 2.3.3", "bytes", @@ -1503,7 +1467,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn", ] [[package]] @@ -1642,7 +1606,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn", "wasm-bindgen-shared", ] @@ -1664,7 +1628,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/frontendservice/Cargo.toml b/frontendservice/Cargo.toml index 4b58ff7d..cc3d8050 100644 --- a/frontendservice/Cargo.toml +++ b/frontendservice/Cargo.toml @@ -11,9 +11,9 @@ path = "src/main.rs" [dependencies] axum = "0.6.20" bytes = "1.5.0" -prost = "0.11.9" -tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] } -tonic = { version = "0.9.2", features = ["tls"] } +prost = "0.12.1" +tokio = { version = "1.32.0", features = ["macros", "rt-multi-thread"] } +tonic = { version = "0.10.2", features = ["tls"] } tower-http = { version = "0.4.3", features = ["trace"] } tracing = "0.1.37" tracing-subscriber = { version = "0.3.17", features = ["default", "env-filter"]} @@ -21,4 +21,4 @@ tracing-futures = "0.2.5" tracing-attributes = "0.1.26" [build-dependencies] -tonic-build = { version = "0.10.1" } +tonic-build = { version = "0.10.2" } diff --git a/frontendservice/Dockerfile b/frontendservice/Dockerfile index a7a03bac..a2012d0f 100644 --- a/frontendservice/Dockerfile +++ b/frontendservice/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.71.1-slim-buster as build +FROM rust:1.73.0-slim-buster as build ENV RUST_LOG frontend=info ENV FORTUNE_SERVICE_HOSTNAME fortuneservice diff --git a/quotationservice/Cargo.toml b/quotationservice/Cargo.toml index 52ef4808..62512f98 100644 --- a/quotationservice/Cargo.toml +++ b/quotationservice/Cargo.toml @@ -12,16 +12,16 @@ path = "src/main.rs" [dependencies] bytes = "1.5.0" -prost = "0.11.9" -tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] } +prost = "0.12.1" +tokio = { version = "1.32.0", features = ["macros", "rt-multi-thread"] } tokio-postgres = "0.7.10" -tonic = { version = "0.9.2", features = ["tls"] } +tonic = { version = "0.10.2", features = ["tls"] } tower = "0.4.13" -tower-http = { version = "0.4.3", features = ["trace"] } +tower-http = { version = "0.4.4", features = ["trace"] } tracing = "0.1.37" tracing-subscriber = { version = "0.3.17", features = ["default", "env-filter"]} tracing-futures = "0.2.5" tracing-attributes = "0.1.26" [build-dependencies] -tonic-build = { version = "0.10.1" } +tonic-build = { version = "0.10.2" } diff --git a/quotationservice/Dockerfile b/quotationservice/Dockerfile index d08d80d3..9072c163 100644 --- a/quotationservice/Dockerfile +++ b/quotationservice/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.71.1-slim-buster as build +FROM rust:1.73.0-slim-buster as build COPY . /code WORKDIR /code