Merge pull request #512 from imsnif/rm-async-trait

Deps: remove direct dependency on async-trait

Author: cyqsimon

CHANGELOG.md

@@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 * Bump MSRV to 1.82.0 - @cyqsimon
 * Bump MSRV to 1.88.0 - @cyqsimon
 * Deps: migrate from trust-dns-resolver to hickory-resolver #510 - @cyqsimon
+* Deps: remove direct dependency on async-trait #512 - @cyqsimon
 
 ## [0.23.1] - 2024-10-09
 

Cargo.lock

@@ -26,7 +26,6 @@ default = []
 ui_test = []
 
 [dependencies]
-async-trait = "0.1.89"
 chrono = "0.4"
 clap-verbosity-flag = "3.0.4"
 clap = { version = "4.5.61", features = ["derive"] }

Cargo.toml

@@ -1,18 +1,17 @@
 use std::{
+    future::Future,
     net::{IpAddr, Ipv4Addr},
     slice,
 };
 
-use async_trait::async_trait;
 use hickory_resolver::{
     config::{ResolverConfig, ServerGroup},
     net::runtime::TokioRuntimeProvider,
     TokioResolver,
 };
 
-#[async_trait]
 pub trait Lookup {
-    async fn lookup(&self, ip: IpAddr) -> Option<String>;
+    fn lookup(&self, ip: IpAddr) -> impl Future<Output = Option<String>> + Send;
 }
 
 pub struct Resolver(TokioResolver);
@@ -37,7 +36,6 @@ impl Resolver {
     }
 }
 
-#[async_trait]
 impl Lookup for Resolver {
     async fn lookup(&self, ip: IpAddr) -> Option<String> {
         let lookup_future = self.0.reverse_lookup(ip);

src/network/dns/resolver.rs

@@ -4,7 +4,6 @@ use std::{
     thread, time,
 };
 
-use async_trait::async_trait;
 use crossterm::event::Event;
 use itertools::Itertools;
 use pnet::{
@@ -177,7 +176,6 @@ pub fn create_fake_dns_client(ips_to_hosts: HashMap<IpAddr, String>) -> Option<d
 
 struct FakeResolver(HashMap<IpAddr, String>);
 
-#[async_trait]
 impl Lookup for FakeResolver {
     async fn lookup(&self, ip: IpAddr) -> Option<String> {
         self.0.get(&ip).cloned()