rust: use a struct to store per-triple release metadata

Just stores the suffixes for now. We'll expand this later.

Author: indygreg

src/github.rs

@@ -3,7 +3,7 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 use {
-    crate::release::SUFFIXES_BY_TRIPLE,
+    crate::release::RELEASE_TRIPLES,
     anyhow::{anyhow, Result},
     clap::ArgMatches,
     futures::StreamExt,
@@ -102,14 +102,14 @@ pub async fn command_fetch_release_distributions(args: &ArgMatches<'_>) -> Resul
 
             let name = zf.name().to_string();
 
-            if let Some(suffixes) = SUFFIXES_BY_TRIPLE.iter().find_map(|(triple, suffixes)| {
+            if let Some(release) = RELEASE_TRIPLES.iter().find_map(|(triple, release)| {
                 if name.contains(triple) {
-                    Some(suffixes)
+                    Some(release)
                 } else {
                     None
                 }
             }) {
-                if suffixes.iter().any(|suffix| name.contains(suffix)) {
+                if release.suffixes.iter().any(|suffix| name.contains(suffix)) {
                     let dest_path = dest_dir.join(&name);
                     let mut buf = vec![];
                     zf.read_to_end(&mut buf)?;
@@ -170,8 +170,8 @@ pub async fn command_upload_release_distributions(args: &ArgMatches<'_>) -> Resu
 
     let mut wanted_filenames = BTreeSet::new();
     for version in python_versions {
-        for (triple, suffixes) in SUFFIXES_BY_TRIPLE.iter() {
-            for suffix in suffixes {
+        for (triple, release) in RELEASE_TRIPLES.iter() {
+            for suffix in &release.suffixes {
                 let extension = if suffix.contains("install_only") {
                     "tar.gz"
                 } else {

src/release.rs

@@ -4,35 +4,111 @@
 
 use {once_cell::sync::Lazy, std::collections::BTreeMap};
 
-pub static SUFFIXES_BY_TRIPLE: Lazy<BTreeMap<&'static str, Vec<&'static str>>> = Lazy::new(|| {
+/// Describes a release for a given target triple.
+pub struct TripleRelease {
+    /// Build suffixes to release.
+    pub suffixes: Vec<&'static str>,
+}
+
+pub static RELEASE_TRIPLES: Lazy<BTreeMap<&'static str, TripleRelease>> = Lazy::new(|| {
     let mut h = BTreeMap::new();
 
     // macOS.
     let macos_suffixes = vec!["debug", "lto", "pgo", "pgo+lto", "install_only"];
-    h.insert("aarch64-apple-darwin", macos_suffixes.clone());
-    h.insert("x86_64-apple-darwin", macos_suffixes);
+    h.insert(
+        "aarch64-apple-darwin",
+        TripleRelease {
+            suffixes: macos_suffixes.clone(),
+        },
+    );
+    h.insert(
+        "x86_64-apple-darwin",
+        TripleRelease {
+            suffixes: macos_suffixes,
+        },
+    );
 
     // Windows.
     let windows_suffixes = vec!["shared-pgo", "static-noopt", "shared-install_only"];
-    h.insert("i686-pc-windows-msvc", windows_suffixes.clone());
-    h.insert("x86_64-pc-windows-msvc", windows_suffixes);
+    h.insert(
+        "i686-pc-windows-msvc",
+        TripleRelease {
+            suffixes: windows_suffixes.clone(),
+        },
+    );
+    h.insert(
+        "x86_64-pc-windows-msvc",
+        TripleRelease {
+            suffixes: windows_suffixes,
+        },
+    );
 
     // Linux.
     let linux_suffixes_pgo = vec!["debug", "lto", "pgo", "pgo+lto", "install_only"];
     let linux_suffixes_nopgo = vec!["debug", "lto", "noopt", "install_only"];
 
-    h.insert("aarch64-unknown-linux-gnu", linux_suffixes_nopgo.clone());
+    h.insert(
+        "aarch64-unknown-linux-gnu",
+        TripleRelease {
+            suffixes: linux_suffixes_nopgo.clone(),
+        },
+    );
 
-    h.insert("i686-unknown-linux-gnu", linux_suffixes_pgo.clone());
+    h.insert(
+        "i686-unknown-linux-gnu",
+        TripleRelease {
+            suffixes: linux_suffixes_pgo.clone(),
+        },
+    );
 
-    h.insert("x86_64-unknown-linux-gnu", linux_suffixes_pgo.clone());
-    h.insert("x86_64_v2-unknown-linux-gnu", linux_suffixes_pgo.clone());
-    h.insert("x86_64_v3-unknown-linux-gnu", linux_suffixes_pgo.clone());
-    h.insert("x86_64_v4-unknown-linux-gnu", linux_suffixes_nopgo.clone());
-    h.insert("x86_64-unknown-linux-musl", linux_suffixes_nopgo.clone());
-    h.insert("x86_64_v2-unknown-linux-musl", linux_suffixes_nopgo.clone());
-    h.insert("x86_64_v3-unknown-linux-musl", linux_suffixes_nopgo.clone());
-    h.insert("x86_64_v4-unknown-linux-musl", linux_suffixes_nopgo.clone());
+    h.insert(
+        "x86_64-unknown-linux-gnu",
+        TripleRelease {
+            suffixes: linux_suffixes_pgo.clone(),
+        },
+    );
+    h.insert(
+        "x86_64_v2-unknown-linux-gnu",
+        TripleRelease {
+            suffixes: linux_suffixes_pgo.clone(),
+        },
+    );
+    h.insert(
+        "x86_64_v3-unknown-linux-gnu",
+        TripleRelease {
+            suffixes: linux_suffixes_pgo.clone(),
+        },
+    );
+    h.insert(
+        "x86_64_v4-unknown-linux-gnu",
+        TripleRelease {
+            suffixes: linux_suffixes_nopgo.clone(),
+        },
+    );
+    h.insert(
+        "x86_64-unknown-linux-musl",
+        TripleRelease {
+            suffixes: linux_suffixes_nopgo.clone(),
+        },
+    );
+    h.insert(
+        "x86_64_v2-unknown-linux-musl",
+        TripleRelease {
+            suffixes: linux_suffixes_nopgo.clone(),
+        },
+    );
+    h.insert(
+        "x86_64_v3-unknown-linux-musl",
+        TripleRelease {
+            suffixes: linux_suffixes_nopgo.clone(),
+        },
+    );
+    h.insert(
+        "x86_64_v4-unknown-linux-musl",
+        TripleRelease {
+            suffixes: linux_suffixes_nopgo.clone(),
+        },
+    );
 
     h
 });