From 07b3af916685432f94b60609a9e429b4b9dff728 Mon Sep 17 00:00:00 2001 From: Katalina Okano Date: Sun, 27 Nov 2022 22:20:25 -0500 Subject: [PATCH] cleanup --- Cargo.lock | 152 ++-------------------------------- services/api/Cargo.toml | 6 +- services/api/src/health.rs | 2 - services/api/src/main.rs | 2 - services/websocket/Cargo.toml | 4 +- 5 files changed, 11 insertions(+), 155 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d1031ec..7ee0970 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,15 +21,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - [[package]] name = "api" version = "0.1.0" @@ -64,7 +55,6 @@ dependencies = [ "async-trait", "base64", "bytes", - "chrono", "fast_chemail", "fnv", "futures-util", @@ -343,18 +333,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chrono" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" -dependencies = [ - "iana-time-zone", - "num-integer", - "num-traits", - "winapi", -] - [[package]] name = "codegen" version = "0.1.0" @@ -369,16 +347,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - [[package]] name = "combine" version = "4.6.6" @@ -437,50 +405,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "cxx" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "darling" version = "0.14.2" @@ -853,30 +777,6 @@ dependencies = [ "tokio-native-tls", ] -[[package]] -name = "iana-time-zone" -version = "0.1.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -dependencies = [ - "cxx", - "cxx-build", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -964,15 +864,6 @@ version = "0.2.137" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" -[[package]] -name = "link-cplusplus" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" -dependencies = [ - "cc", -] - [[package]] name = "lock_api" version = "0.4.9" @@ -1064,16 +955,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.15" @@ -1470,12 +1351,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "scratch" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" - [[package]] name = "security-framework" version = "2.7.0" @@ -1501,18 +1376,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.147" +version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c" dependencies = [ "proc-macro2", "quote", @@ -1633,9 +1508,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce" dependencies = [ "proc-macro2", "quote", @@ -1686,15 +1561,6 @@ dependencies = [ "unic-segment", ] -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - [[package]] name = "thiserror" version = "1.0.37" @@ -1995,12 +1861,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - [[package]] name = "url" version = "2.3.1" diff --git a/services/api/Cargo.toml b/services/api/Cargo.toml index da729ff..bb1ff6b 100644 --- a/services/api/Cargo.toml +++ b/services/api/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" [dependencies] redis = { version = "0.22.1", features = ["aio", "r2d2", "tokio-comp"] } -serde_json = "1.0.88" -serde = "1.0.147" -async-graphql = { version = "4.0.16", features = ["apollo_tracing"] } +serde_json = "1.0.89" +serde = "1.0.148" +async-graphql = { version = "4.0.16" } async-graphql-axum = "4.0.16" axum = "0.6.0" tokio = { version = "1.22.0" } diff --git a/services/api/src/health.rs b/services/api/src/health.rs index 4d6d0fe..f3ea75e 100644 --- a/services/api/src/health.rs +++ b/services/api/src/health.rs @@ -1,5 +1,3 @@ -use std::any::Any; - use async_graphql::{Context, Enum, Object}; use axum::{http::StatusCode, response::IntoResponse, Extension, Json}; use redis::{aio::MultiplexedConnection, pipe}; diff --git a/services/api/src/main.rs b/services/api/src/main.rs index c0b5278..6bff475 100644 --- a/services/api/src/main.rs +++ b/services/api/src/main.rs @@ -6,7 +6,6 @@ mod vehicles; mod world; use async_graphql::{ - extensions::ApolloTracing, http::{playground_source, GraphQLPlaygroundConfig}, EmptyMutation, EmptySubscription, Request, Response, Schema, }; @@ -68,7 +67,6 @@ async fn main() { let schema = Schema::build(query::Query, EmptyMutation, EmptySubscription) .data(redis.clone()) - .extension(ApolloTracing) .finish(); let app = Router::new() diff --git a/services/websocket/Cargo.toml b/services/websocket/Cargo.toml index 558d5aa..84ac9f2 100644 --- a/services/websocket/Cargo.toml +++ b/services/websocket/Cargo.toml @@ -9,8 +9,8 @@ edition = "2021" redis = { version = "0.22.1", default_features = false, features = ["r2d2"] } lazy_static = "1.4.0" tokio-tungstenite = { version = "0.17.2", features=["native-tls"] } -serde_json = "1.0.88" -serde = { version = "1.0.147", features = ["derive"] } +serde_json = "1.0.89" +serde = { version = "1.0.148", features = ["derive"] } tokio = { version = "1.22.0" } url = "2.3.1" futures-util = "0.3.25"