summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJoakim Hulthe <joakim@hulthe.net>2025-05-13 16:11:00 +0200
committerJoakim Hulthe <joakim.hulthe@mullvad.net>2025-05-14 18:00:34 +0200
commit4cdeede053eee4429d835f59f9d2d6a3aa7f1070 (patch)
tree3b773c977743226d10fbd2296946a0a7bc685780
parent4a807bd4920da5f7e34a795cde7dca9615935949 (diff)
downloadmullvadvpn-4cdeede053eee4429d835f59f9d2d6a3aa7f1070.tar.xz
mullvadvpn-4cdeede053eee4429d835f59f9d2d6a3aa7f1070.zip
Remove unnecessary tokio::spawn
-rw-r--r--talpid-core/src/resolver.rs16
1 files changed, 9 insertions, 7 deletions
diff --git a/talpid-core/src/resolver.rs b/talpid-core/src/resolver.rs
index b9ea1cb44e..7449b7ed8d 100644
--- a/talpid-core/src/resolver.rs
+++ b/talpid-core/src/resolver.rs
@@ -16,7 +16,6 @@ use std::{
use futures::{
channel::{mpsc, oneshot},
- future::Either,
SinkExt, StreamExt,
};
@@ -171,16 +170,19 @@ impl Resolver {
query: LowerQuery,
tx: oneshot::Sender<std::result::Result<Box<dyn LookupObject>, ResolveError>>,
) {
- let lookup = match self {
- Resolver::Blocking => Either::Left(async move { Self::resolve_blocked(query) }),
+ match self {
+ Resolver::Blocking => {
+ let _ = tx.send(Self::resolve_blocked(query));
+ }
Resolver::Forwarding(resolver) => {
- Either::Right(Self::resolve_forward(resolver.clone(), query))
+ let resolver = resolver.clone();
+ tokio::spawn(async move {
+ let lookup = Self::resolve_forward(resolver, query);
+ let _ = tx.send(lookup.await);
+ });
}
};
- tokio::spawn(async move {
- let _ = tx.send(lookup.await);
- });
}
/// Resolution in blocked state will return spoofed records for captive portal domains.