From 573185bcfa3c39472f688374eb069d991db91684 Mon Sep 17 00:00:00 2001 From: Igor Katson Date: Fri, 3 May 2024 13:17:24 +0100 Subject: [PATCH] Remove async_trait --- Cargo.lock | 1 - crates/librqbit/Cargo.toml | 1 - crates/librqbit/src/peer_connection.rs | 1 - crates/librqbit/src/peer_info_reader/mod.rs | 1 - crates/librqbit/src/torrent_state/live/mod.rs | 1 - 5 files changed, 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a38293f..5f02ebe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1293,7 +1293,6 @@ version = "5.6.4" dependencies = [ "anyhow", "async-stream", - "async-trait", "axum 0.7.5", "backoff", "base64 0.21.7", diff --git a/crates/librqbit/Cargo.toml b/crates/librqbit/Cargo.toml index 21512a2..ba6a09d 100644 --- a/crates/librqbit/Cargo.toml +++ b/crates/librqbit/Cargo.toml @@ -76,7 +76,6 @@ memmap2 = { version = "0.9.4" } rand_distr = { version = "0.4.3", optional = true } lru = { version = "0.12.3", optional = true } -async-trait = "0.1.80" [dev-dependencies] futures = { version = "0.3" } diff --git a/crates/librqbit/src/peer_connection.rs b/crates/librqbit/src/peer_connection.rs index 39b946f..95719fa 100644 --- a/crates/librqbit/src/peer_connection.rs +++ b/crates/librqbit/src/peer_connection.rs @@ -19,7 +19,6 @@ use tracing::trace; use crate::{read_buf::ReadBuf, spawn_utils::BlockingSpawner}; -#[async_trait::async_trait] pub trait PeerConnectionHandler { fn on_connected(&self, _connection_time: Duration) {} fn get_have_bytes(&self) -> u64; diff --git a/crates/librqbit/src/peer_info_reader/mod.rs b/crates/librqbit/src/peer_info_reader/mod.rs index be3bf31..2c752cb 100644 --- a/crates/librqbit/src/peer_info_reader/mod.rs +++ b/crates/librqbit/src/peer_info_reader/mod.rs @@ -141,7 +141,6 @@ struct Handler { locked: RwLock>, } -#[async_trait::async_trait] impl PeerConnectionHandler for Handler { fn get_have_bytes(&self) -> u64 { 0 diff --git a/crates/librqbit/src/torrent_state/live/mod.rs b/crates/librqbit/src/torrent_state/live/mod.rs index 7c7eb41..5a1b31c 100644 --- a/crates/librqbit/src/torrent_state/live/mod.rs +++ b/crates/librqbit/src/torrent_state/live/mod.rs @@ -824,7 +824,6 @@ struct PeerHandler { tx: PeerTx, } -#[async_trait::async_trait] impl<'a> PeerConnectionHandler for &'a PeerHandler { fn on_connected(&self, connection_time: Duration) { self.counters