diff --git a/updater/src/adoptium.rs b/updater/src/adoptium.rs index ef26421..492f9bd 100644 --- a/updater/src/adoptium.rs +++ b/updater/src/adoptium.rs @@ -1,4 +1,4 @@ -use std::collections::HashMap; +use std::collections::BTreeMap; use color_eyre::{ eyre::{eyre, Context, Result}, @@ -182,11 +182,11 @@ pub async fn get_release(client: &Client, version: u64, release_type: &str) -> R } /// Attempts to get all the versions -pub async fn get_releases(client: &Client) -> Result> { +pub async fn get_releases(client: &Client) -> Result> { let available = get_available_releases(client) .await .context("Failed to list adoptium releases")?; - let mut output = HashMap::new(); + let mut output = BTreeMap::new(); // Get the generally available version of all the available releases for version in available.available_releases { let release = get_release(client, version, "ga").await.with_context(|| { diff --git a/updater/src/main.rs b/updater/src/main.rs index 90220ed..0c2dd2f 100644 --- a/updater/src/main.rs +++ b/updater/src/main.rs @@ -1,4 +1,4 @@ -use std::{collections::HashMap, process::Command}; +use std::{collections::BTreeMap, process::Command}; use color_eyre::{ eyre::{eyre, Context, Result}, @@ -25,7 +25,7 @@ pub struct Release { /// Sources serialization struct #[derive(Deserialize, Serialize, Debug, Clone, Default)] pub struct Sources { - versions: HashMap, + versions: BTreeMap, latest: Release, stable: Release, lts: Release, @@ -120,7 +120,7 @@ async fn main() -> Result<()> { .clone(), }; let system = System { temurin, semeru }; - let mut systems = HashMap::new(); + let mut systems = BTreeMap::new(); systems.insert("x86_64-linux".to_string(), system); let output = serde_json::to_string_pretty(&systems).context("Failed to encode sources")?; println!("{}", output); @@ -128,8 +128,8 @@ async fn main() -> Result<()> { } /// Get the releases from adoptium -pub async fn get_adoptium_releases(client: &Client) -> Result> { - let releases: Result> = adoptium::get_releases(client) +pub async fn get_adoptium_releases(client: &Client) -> Result> { + let releases: Result> = adoptium::get_releases(client) .await? .into_iter() .map(|(key, val)| match val.try_into() { @@ -142,8 +142,8 @@ pub async fn get_adoptium_releases(client: &Client) -> Result Result> { - let releases: Result> = semeru::get_releases(client) +pub async fn get_semeru_releases(client: &Client) -> Result> { + let releases: Result> = semeru::get_releases(client) .await? .into_iter() .map(|(key, val)| match val.try_into() { diff --git a/updater/src/semeru.rs b/updater/src/semeru.rs index 96541da..70904bd 100644 --- a/updater/src/semeru.rs +++ b/updater/src/semeru.rs @@ -1,4 +1,4 @@ -use std::collections::HashMap; +use std::collections::BTreeMap; use color_eyre::{ eyre::{eyre, Context, Result}, @@ -58,11 +58,11 @@ pub async fn get_release(client: &Client, version: u64, release_type: &str) -> R } /// Attempts to get all the versions -pub async fn get_releases(client: &Client) -> Result> { +pub async fn get_releases(client: &Client) -> Result> { let available = get_available_releases(client) .await .context("Failed to list semeru releases")?; - let mut output = HashMap::new(); + let mut output = BTreeMap::new(); // Get the generally available version of all the available releases for version in available.available_releases { let release = get_release(client, version, "ga").await.with_context(|| {