pyrite/torn-api.rs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

actually implement new trait

Browse source
This commit is contained in:
TotallyNot 2022-08-31 23:51:25 +02:00
parent 898f7f9a62
commit 9505ccc67e
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
torn-key-pool/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "torn-key-pool" name = "torn-key-pool"
version = "0.1.1" version = "0.1.2"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -8,14 +8,20 @@ edition = "2021"
[features] [features]
default = [ "postgres" ] default = [ "postgres" ]
postgres = [ "dep:sqlx", "dep:chrono", "dep:indoc" ] postgres = [ "dep:sqlx", "dep:chrono", "dep:indoc" ]
reqwest = [ "dep:reqwest", "torn-api/reqwest" ]
awc = [ "dep:awc", "torn-api/awc" ]
[dependencies] [dependencies]
torn-api = { path = "../torn-api", default-features = false } torn-api = { path = "../torn-api", default-features = false }
async-trait = "0.1"
thiserror = "1"
sqlx = { version = "0.6", features = [ "postgres", "chrono" ], optional = true } sqlx = { version = "0.6", features = [ "postgres", "chrono" ], optional = true }
chrono = { version = "0.4", optional = true } chrono = { version = "0.4", optional = true }
indoc = { version = "1", optional = true } indoc = { version = "1", optional = true }
async-trait = "0.1"
thiserror = "1" reqwest = { version = "0.11", default-features = false, features = [ "json" ], optional = true }
awc = { version = "3", default-features = false, optional = true }
[dev-dependencies] [dev-dependencies]
torn-api = { path = "../torn-api", features = [ "reqwest" ] } torn-api = { path = "../torn-api", features = [ "reqwest" ] }
@ -23,4 +29,5 @@ sqlx = { version = "*", features = [ "runtime-tokio-rustls" ] }
dotenv = "0.15.0" dotenv = "0.15.0"
tokio = { version = "1.20.1", features = ["test-util", "rt", "macros"] } tokio = { version = "1.20.1", features = ["test-util", "rt", "macros"] }
tokio-test = "0.4.2" tokio-test = "0.4.2"
reqwest = { version = "0.11", features = [ "json" ] } reqwest = { version = "*", default-features = true }
awc = { version = "*", features = [ "rustls" ] }

8
torn-key-pool/src/lib.rs
View file

@ -128,7 +128,7 @@ where
} }
} }
pub trait ApiClientExt: ApiClient { pub trait KeyPoolClient: ApiClient {
fn with_pool<'a, S>(&'a self, domain: KeyDomain, storage: &'a S) -> KeyPoolExecutor<Self, S> fn with_pool<'a, S>(&'a self, domain: KeyDomain, storage: &'a S) -> KeyPoolExecutor<Self, S>
where where
Self: Sized, Self: Sized,
@ -137,3 +137,9 @@ pub trait ApiClientExt: ApiClient {
KeyPoolExecutor::new(self, storage, domain) KeyPoolExecutor::new(self, storage, domain)
} }
} }
#[cfg(feature = "reqwest")]
impl KeyPoolClient for reqwest::Client {}
#[cfg(feature = "awc")]
impl KeyPoolClient for awc::Client {}