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

feat: simplified lifetime bounds on bulk executor

Browse source
This commit is contained in:
TotallyNot 2025-04-29 22:46:43 +02:00
parent c17f93f600
commit 7bc61de1c2
Signed by: pyrite
GPG key ID: 7F1BA9170CD35D15
8 changed files with 32 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
torn-api/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "torn-api"
version = "1.1.0"
version = "1.1.1"
edition = "2021"
description = "Auto-generated bindings for the v2 torn api"
license-file = { workspace = true }
@ -36,7 +36,7 @@ futures = { version = "0.3", default-features = false, features = [
tokio = { version = "1", features = ["full"] }
[build-dependencies]
torn-api-codegen = { path = "../torn-api-codegen", version = "0.2" }
torn-api-codegen = { path = "../torn-api-codegen", version = "0.2.1" }
syn = { workspace = true, features = ["parsing"] }
proc-macro2 = { workspace = true }
prettyplease = "0.2"

34
torn-api/src/executor.rs
View file

@ -56,7 +56,7 @@ pub trait Executor: Sized {
}
}
pub trait BulkExecutor<'e>: 'e + Sized {
pub trait BulkExecutor: Sized {
type Error: From<serde_json::Error> + From<crate::ApiError> + Send;
fn execute<R>(
@ -158,46 +158,46 @@ where
}
#[cfg(feature = "scopes")]
pub trait BulkExecutorExt<'e>: BulkExecutor<'e> + Sized {
fn user_bulk(self) -> BulkUserScope<'e, Self>;
pub trait BulkExecutorExt: BulkExecutor + Sized {
fn user_bulk(self) -> BulkUserScope<Self>;
fn faction_bulk(self) -> BulkFactionScope<'e, Self>;
fn faction_bulk(self) -> BulkFactionScope<Self>;
fn torn_bulk(self) -> BulkTornScope<'e, Self>;
fn torn_bulk(self) -> BulkTornScope<Self>;
fn market_bulk(self) -> BulkMarketScope<'e, Self>;
fn market_bulk(self) -> BulkMarketScope<Self>;
fn racing_bulk(self) -> BulkRacingScope<'e, Self>;
fn racing_bulk(self) -> BulkRacingScope<Self>;
fn forum_bulk(self) -> BulkForumScope<'e, Self>;
fn forum_bulk(self) -> BulkForumScope<Self>;
}
#[cfg(feature = "scopes")]
impl<'e, T> BulkExecutorExt<'e> for T
impl<'e, T> BulkExecutorExt for T
where
T: BulkExecutor<'e> + Sized,
T: BulkExecutor + Sized,
{
fn user_bulk(self) -> BulkUserScope<'e, Self> {
fn user_bulk(self) -> BulkUserScope<Self> {
BulkUserScope::new(self)
}
fn faction_bulk(self) -> BulkFactionScope<'e, Self> {
fn faction_bulk(self) -> BulkFactionScope<Self> {
BulkFactionScope::new(self)
}
fn torn_bulk(self) -> BulkTornScope<'e, Self> {
fn torn_bulk(self) -> BulkTornScope<Self> {
BulkTornScope::new(self)
}
fn market_bulk(self) -> BulkMarketScope<'e, Self> {
fn market_bulk(self) -> BulkMarketScope<Self> {
BulkMarketScope::new(self)
}
fn racing_bulk(self) -> BulkRacingScope<'e, Self> {
fn racing_bulk(self) -> BulkRacingScope<Self> {
BulkRacingScope::new(self)
}
fn forum_bulk(self) -> BulkForumScope<'e, Self> {
fn forum_bulk(self) -> BulkForumScope<Self> {
BulkForumScope::new(self)
}
}
@ -246,7 +246,7 @@ impl Executor for &ReqwestClient {
}
}
impl<'e> BulkExecutor<'e> for &'e ReqwestClient {
impl BulkExecutor for &ReqwestClient {
type Error = crate::Error;
fn execute<R>(