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

use IntoSelector trait for key pool requests

Browse source
This commit is contained in:
TotallyNot 2023-06-13 17:05:30 +02:00
parent 0799d6d475
commit 44d85aaa78
4 changed files with 41 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,8 +29,8 @@ where
Response(ResponseError),
}
pub trait ApiKey: Sync + Send {
type IdType: PartialEq + Eq + std::hash::Hash + Send + Sync;
pub trait ApiKey: Sync + Send + std::fmt::Debug + Clone {
type IdType: PartialEq + Eq + std::hash::Hash + Send + Sync + std::fmt::Debug + Clone;
fn value(&self) -> &str;
@ -66,7 +66,7 @@ where
Self::Key(_) | Self::UserId(_) | Self::Id(_) => None,
Self::Has(domain) => domain.fallback().map(Self::Has),
Self::OneOf(domains) => {
let fallbacks: Vec<_> = domains.into_iter().filter_map(|d| d.fallback()).collect();
let fallbacks: Vec<_> = domains.iter().filter_map(|d| d.fallback()).collect();
if fallbacks.is_empty() {
None
} else {
@ -176,7 +176,7 @@ where
{
storage: &'a S,
comment: Option<&'a str>,
domain: S::Domain,
selector: KeySelector<S::Key, S::Domain>,
_marker: std::marker::PhantomData<C>,
}
@ -184,10 +184,14 @@ impl<'a, C, S> KeyPoolExecutor<'a, C, S>
where
S: KeyPoolStorage,
{
pub fn new(storage: &'a S, domain: S::Domain, comment: Option<&'a str>) -> Self {
pub fn new(
storage: &'a S,
selector: KeySelector<S::Key, S::Domain>,
comment: Option<&'a str>,
) -> Self {
Self {
storage,
domain,
selector,
comment,
_marker: std::marker::PhantomData,
}