diff --git a/.cargo/config.toml b/.cargo/config.toml index 6629c6e..4e5bd93 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,2 +1,2 @@ -[registries.jojo-dev] -index = "https://git.jojodev.com/joeyahines/_cargo-index.git" \ No newline at end of file +[registries.ahines] +index = "https://git.ahines.net/joeyahines/_cargo-index.git" \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index a1b3d3c..14f5c54 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -182,34 +182,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core 0.3.4", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.32", - "itoa", - "matchit 0.7.3", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper 0.1.2", - "tower 0.4.13", - "tower-layer", - "tower-service", -] - [[package]] name = "axum" version = "0.7.9" @@ -271,23 +243,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - [[package]] name = "axum-core" version = "0.4.5" @@ -1107,7 +1062,7 @@ dependencies = [ "json", "magick_rust", "ndm", - "prost 0.13.5", + "prost", "raas_types", "rand 0.9.0", "regex", @@ -1120,7 +1075,7 @@ dependencies = [ "structopt", "tera", "tokio", - "tonic 0.12.3", + "tonic", ] [[package]] @@ -1627,18 +1582,6 @@ dependencies = [ "webpki-roots 0.26.7", ] -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper 0.14.32", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - [[package]] name = "hyper-timeout" version = "0.5.2" @@ -1933,8 +1876,8 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "j_db" version = "0.1.2" -source = "registry+https://git.jojodev.com/joeyahines/_cargo-index.git" -checksum = "ae76696901f0cd9f850fe6608f4ce640c055444a2f453382fb7deda45a141b75" +source = "registry+https://git.ahines.net/joeyahines/_cargo-index.git" +checksum = "d73856683f9eafe7b2414e099fcedd53d7cbae8da70cf2d671c23750c1eab975" dependencies = [ "byteorder", "json", @@ -2710,16 +2653,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" -dependencies = [ - "bytes", - "prost-derive 0.12.6", -] - [[package]] name = "prost" version = "0.13.5" @@ -2727,16 +2660,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" dependencies = [ "bytes", - "prost-derive 0.13.5", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.12.6" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" dependencies = [ - "bytes", "heck 0.5.0", "itertools", "log", @@ -2744,26 +2676,13 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost 0.12.6", + "prost", "prost-types", "regex", "syn 2.0.91", "tempfile", ] -[[package]] -name = "prost-derive" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 2.0.91", -] - [[package]] name = "prost-derive" version = "0.13.5" @@ -2779,11 +2698,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.6" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16" dependencies = [ - "prost 0.12.6", + "prost", ] [[package]] @@ -2860,13 +2779,13 @@ dependencies = [ [[package]] name = "raas_types" -version = "0.0.9" -source = "registry+https://git.jojodev.com/joeyahines/_cargo-index.git" -checksum = "c88a524341fb166750c86cd97e0b225d472cc4e243943a30b6488c7a44c3d18e" +version = "0.1.0" +source = "registry+https://git.ahines.net/joeyahines/_cargo-index.git" +checksum = "719ef46b939622ef15b0ee86f230caaa3609e9af6d7e2e58dd70b2364456e489" dependencies = [ "bytes", - "prost 0.12.6", - "tonic 0.11.0", + "prost", + "tonic", "tonic-build", ] @@ -4222,16 +4141,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.4.0" @@ -4397,33 +4306,6 @@ dependencies = [ "winnow 0.6.20", ] -[[package]] -name = "tonic" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" -dependencies = [ - "async-stream", - "async-trait", - "axum 0.6.20", - "base64 0.21.7", - "bytes", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.32", - "hyper-timeout 0.4.1", - "percent-encoding", - "pin-project", - "prost 0.12.6", - "tokio", - "tokio-stream", - "tower 0.4.13", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tonic" version = "0.12.3" @@ -4440,11 +4322,11 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "hyper 1.5.2", - "hyper-timeout 0.5.2", + "hyper-timeout", "hyper-util", "percent-encoding", "pin-project", - "prost 0.13.5", + "prost", "socket2", "tokio", "tokio-stream", @@ -4456,13 +4338,14 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.11.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" +checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11" dependencies = [ "prettyplease", "proc-macro2", "prost-build", + "prost-types", "quote", "syn 2.0.91", ] diff --git a/Cargo.toml b/Cargo.toml index b7b76aa..ad5b6cb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,11 +20,11 @@ json = "0.12.4" axum = "0.8.1" sha3 = "0.10.8" base64 = "0.22.0" -j_db = { version = "0.1.2", registry = "jojo-dev" } +j_db = { version = "0.1.2", registry = "ahines" } chrono = { version = "0.4.31", features = ["serde"] } chrono-tz = "0.10.1" serde_json = "1.0.113" -raas_types = { version = "0.0.9", registry = "jojo-dev"} +raas_types = { version = "0.1.0", registry = "ahines"} tonic = "0.12.3" prost = "0.13.5" emojis = "0.6.2"