summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2025-04-22 09:50:59 +0200
committerDavid Lönnhager <david.l@mullvad.net>2025-04-23 10:36:22 +0200
commit6643458ff1157e09200a889b0cf606b3e48c4d80 (patch)
treed49be5a9f8f84aee3231cdb3a182646ad0693f8a
parent2df5432fe33a0acea1ad322161f487146f4bdd60 (diff)
downloadmullvadvpn-6643458ff1157e09200a889b0cf606b3e48c4d80.tar.xz
mullvadvpn-6643458ff1157e09200a889b0cf606b3e48c4d80.zip
Fix clippy and build errors on macOS for Rust 2024
-rw-r--r--mullvad-api/src/lib.rs4
-rw-r--r--mullvad-api/src/relay_list.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/mullvad-api/src/lib.rs b/mullvad-api/src/lib.rs
index 2d2814d099..d535ce7cbc 100644
--- a/mullvad-api/src/lib.rs
+++ b/mullvad-api/src/lib.rs
@@ -514,7 +514,7 @@ impl AccountsProxy {
pub fn get_data_response(
&self,
account: AccountNumber,
- ) -> impl Future<Output = Result<rest::Response<Incoming>, rest::Error>> {
+ ) -> impl Future<Output = Result<rest::Response<Incoming>, rest::Error>> + use<> {
let service = self.handle.service.clone();
let factory = self.handle.factory.clone();
@@ -545,7 +545,7 @@ impl AccountsProxy {
pub fn create_account_response(
&self,
- ) -> impl Future<Output = Result<rest::Response<Incoming>, rest::Error>> {
+ ) -> impl Future<Output = Result<rest::Response<Incoming>, rest::Error>> + use<> {
let service = self.handle.service.clone();
let factory = self.handle.factory.clone();
diff --git a/mullvad-api/src/relay_list.rs b/mullvad-api/src/relay_list.rs
index 4dfc9b2e8b..9f4100408f 100644
--- a/mullvad-api/src/relay_list.rs
+++ b/mullvad-api/src/relay_list.rs
@@ -36,7 +36,7 @@ impl RelayListProxy {
let request = self.relay_list_response(etag.clone());
async move {
- let response = request.await.map_err(rest::Error::from)?;
+ let response = request.await?;
if etag.is_some() && response.status() == StatusCode::NOT_MODIFIED {
return Ok(None);