From cf9c0bc5e15abf7ba06c71fbfe97f5a2aea574c1 Mon Sep 17 00:00:00 2001 From: Paul Makles Date: Wed, 18 Jan 2023 19:06:05 +0000 Subject: [PATCH] chore: bump rauth --- Cargo.lock | 64 ++++++----------------------------------- crates/delta/Cargo.toml | 2 +- crates/quark/Cargo.toml | 2 +- 3 files changed, 11 insertions(+), 57 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 63bd840a..09263c63 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2069,17 +2069,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "okapi" -version = "0.7.0-rc.1" -source = "git+https://github.com/insertish/okapi?rev=a1048d0c8cd771e424ec97d33d825c32e06aa120#a1048d0c8cd771e424ec97d33d825c32e06aa120" -dependencies = [ - "log", - "schemars", - "serde", - "serde_json", -] - [[package]] name = "once_cell" version = "1.13.0" @@ -2592,7 +2581,7 @@ dependencies = [ [[package]] name = "rauth" version = "1.0.0" -source = "git+https://github.com/insertish/rauth?rev=cbdec69c684a4854fbedba9ed1f0e7ee466bf3f7#cbdec69c684a4854fbedba9ed1f0e7ee466bf3f7" +source = "git+https://github.com/insertish/rauth?rev=195f1703cc4c57be01a39f465296cab4e22524b3#195f1703cc4c57be01a39f465296cab4e22524b3" dependencies = [ "async-std", "async-trait", @@ -2607,12 +2596,12 @@ dependencies = [ "log", "mongodb", "nanoid", - "okapi", "rand 0.8.5", "regex", "reqwest", + "revolt_okapi", + "revolt_rocket_okapi", "rocket", - "rocket_okapi", "rust-argon2", "schemars", "serde", @@ -2844,7 +2833,7 @@ dependencies = [ "revolt-quark", "revolt_rocket_okapi", "rocket", - "rocket_empty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rocket_empty", "rocket_rauth", "schemars", "serde", @@ -2891,7 +2880,7 @@ dependencies = [ "revolt_rocket_okapi", "rocket", "rocket_cors", - "rocket_empty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rocket_empty", "rocket_http", "schemars", "sentry", @@ -3062,14 +3051,6 @@ dependencies = [ "rocket", ] -[[package]] -name = "rocket_empty" -version = "0.1.1" -source = "git+https://github.com/insertish/rocket_empty?branch=master#7488be6a5d2a70744fe81b9dcc60df5866b4c8ba" -dependencies = [ - "rocket", -] - [[package]] name = "rocket_http" version = "0.5.0-rc.2" @@ -3097,44 +3078,17 @@ dependencies = [ "uncased", ] -[[package]] -name = "rocket_okapi" -version = "0.8.0-rc.1" -source = "git+https://github.com/insertish/okapi?rev=a1048d0c8cd771e424ec97d33d825c32e06aa120#a1048d0c8cd771e424ec97d33d825c32e06aa120" -dependencies = [ - "either", - "log", - "okapi", - "rocket", - "rocket_okapi_codegen", - "schemars", - "serde", - "serde_json", -] - -[[package]] -name = "rocket_okapi_codegen" -version = "0.8.0-rc.1" -source = "git+https://github.com/insertish/okapi?rev=a1048d0c8cd771e424ec97d33d825c32e06aa120#a1048d0c8cd771e424ec97d33d825c32e06aa120" -dependencies = [ - "darling", - "proc-macro2", - "quote 1.0.18", - "rocket_http", - "syn 1.0.96", -] - [[package]] name = "rocket_rauth" version = "1.0.0" -source = "git+https://github.com/insertish/rauth?rev=cbdec69c684a4854fbedba9ed1f0e7ee466bf3f7#cbdec69c684a4854fbedba9ed1f0e7ee466bf3f7" +source = "git+https://github.com/insertish/rauth?rev=195f1703cc4c57be01a39f465296cab4e22524b3#195f1703cc4c57be01a39f465296cab4e22524b3" dependencies = [ "iso8601-timestamp", - "okapi", "rauth", + "revolt_okapi", + "revolt_rocket_okapi", "rocket", - "rocket_empty 0.1.1 (git+https://github.com/insertish/rocket_empty?branch=master)", - "rocket_okapi", + "rocket_empty", "schemars", "serde", ] diff --git a/crates/delta/Cargo.toml b/crates/delta/Cargo.toml index 39d2814b..056fcb9d 100644 --- a/crates/delta/Cargo.toml +++ b/crates/delta/Cargo.toml @@ -52,7 +52,7 @@ mobc-redis = { version = "0.7.0", default-features = false, features = ["async-s # web rocket = { version = "0.5.0-rc.2", default-features = false, features = ["json"] } rocket_empty = { version = "0.1.1", features = ["schema"] } -rocket_rauth = { git = "https://github.com/insertish/rauth", rev = "cbdec69c684a4854fbedba9ed1f0e7ee466bf3f7" } +rocket_rauth = { git = "https://github.com/insertish/rauth", rev = "195f1703cc4c57be01a39f465296cab4e22524b3" } # spec generation schemars = "0.8.8" diff --git a/crates/quark/Cargo.toml b/crates/quark/Cargo.toml index 4c85f53f..51b5666c 100644 --- a/crates/quark/Cargo.toml +++ b/crates/quark/Cargo.toml @@ -84,7 +84,7 @@ rocket_empty = { version = "0.1.1", optional = true, features = [ "schema" ] } rocket_cors = { optional = true, git = "https://github.com/lawliet89/rocket_cors", rev = "c17e8145baa4790319fdb6a473e465b960f55e7c" } # rAuth -rauth = { git = "https://github.com/insertish/rauth", rev = "cbdec69c684a4854fbedba9ed1f0e7ee466bf3f7", features = [ "async-std-runtime" ] } +rauth = { git = "https://github.com/insertish/rauth", rev = "195f1703cc4c57be01a39f465296cab4e22524b3", features = [ "async-std-runtime" ] } # Sentry sentry = "0.25.0"