diff options
| author | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2025-04-22 13:29:05 +0200 |
|---|---|---|
| committer | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2025-04-23 10:46:36 +0200 |
| commit | f11903757ec9996809b73253ad06e2afd80f1e5b (patch) | |
| tree | 054ee7fc5cc58e12fcfdf603c3cd7a7d00881d3b | |
| parent | fc4d6176ac0c26bb85bca693b28b3b6f663e4487 (diff) | |
| download | mullvadvpn-f11903757ec9996809b73253ad06e2afd80f1e5b.tar.xz mullvadvpn-f11903757ec9996809b73253ad06e2afd80f1e5b.zip | |
Remove `async_trait` for `VersionInfoProvider`
| -rw-r--r-- | installer-downloader/tests/mock.rs | 1 | ||||
| -rw-r--r-- | mullvad-update/src/client/api.rs | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/installer-downloader/tests/mock.rs b/installer-downloader/tests/mock.rs index 3cb1bd7807..a193f2d9a7 100644 --- a/installer-downloader/tests/mock.rs +++ b/installer-downloader/tests/mock.rs @@ -37,7 +37,6 @@ pub const FAKE_ENVIRONMENT: Environment = Environment { architecture: Architecture::X86, }; -#[async_trait::async_trait] impl VersionInfoProvider for FakeVersionInfoProvider { async fn get_version_info(&self, _params: VersionParameters) -> anyhow::Result<VersionInfo> { if self.fail_fetching.load(std::sync::atomic::Ordering::SeqCst) { diff --git a/mullvad-update/src/client/api.rs b/mullvad-update/src/client/api.rs index c4953177b3..d4806325e5 100644 --- a/mullvad-update/src/client/api.rs +++ b/mullvad-update/src/client/api.rs @@ -48,10 +48,12 @@ impl MetaRepositoryPlatform { } /// See [module-level](self) docs. -#[async_trait::async_trait] pub trait VersionInfoProvider { /// Return info about the stable version - async fn get_version_info(&self, params: VersionParameters) -> anyhow::Result<VersionInfo>; + fn get_version_info( + &self, + params: VersionParameters, + ) -> impl std::future::Future<Output = anyhow::Result<VersionInfo>> + Send; } /// Obtain version data using a GET request @@ -62,7 +64,6 @@ pub struct HttpVersionInfoProvider { pinned_certificate: Option<reqwest::Certificate>, } -#[async_trait::async_trait] impl VersionInfoProvider for HttpVersionInfoProvider { async fn get_version_info(&self, params: VersionParameters) -> anyhow::Result<VersionInfo> { let response = self.get_versions(params.lowest_metadata_version).await?; |