refactor: split ids into multiple strs

Author: JyJyJcr

Cargo.lock

@@ -21,3 +21,4 @@ duct = "0.13.7"
 ureq = { version = "2.9.6", features = ["tls"] }
 flate2 = "1.0.28"
 tar = "0.4.40"
+constcat = "0.5.0"

nginx-sys/Cargo.toml

@@ -17,57 +17,63 @@ use flate2::read::GzDecoder;
 use tar::Archive;
 use which::which;
 
+macro_rules! server_and_keys {
+    ($s:expr;$($x:expr,)*) => {
+        [$(($s,$x),)*]
+    };
+}
+
 const UBUNTU_KEYSERVER: &str = "hkps://keyserver.ubuntu.com";
 /// The default version of zlib to use if the `ZLIB_VERSION` environment variable is not present
 const ZLIB_DEFAULT_VERSION: &str = "1.3.1";
 /// Key 1: Mark Adler's public key. For zlib 1.3.1 and earlier
-const ZLIB_GPG_SERVER_AND_KEY_ID: (&str, &str) = (UBUNTU_KEYSERVER, "5ED46A6721D365587791E2AA783FCD8E58BCAFBA");
+const ZLIB_GPG_SERVER_AND_KEY_IDS: [(&str, &str); 1] =
+    server_and_keys![UBUNTU_KEYSERVER; "5ED46A6721D365587791E2AA783FCD8E58BCAFBA",];
 const ZLIB_DOWNLOAD_URL_PREFIX: &str = "https://github.com/madler/zlib/releases/download";
 /// The default version of pcre to use if the `PCRE2_VERSION` environment variable is not present
 const PCRE1_DEFAULT_VERSION: &str = "8.45";
 const PCRE2_DEFAULT_VERSION: &str = "10.42";
 /// Key 1: Phillip Hazel's public key. For PCRE2 10.42 and earlier
-const PCRE2_GPG_SERVER_AND_KEY_ID: (&str, &str) = (UBUNTU_KEYSERVER, "45F68D54BBE23FB3039B46E59766E084FB0F43D8");
+const PCRE2_GPG_SERVER_AND_KEY_IDS: [(&str, &str); 1] =
+    server_and_keys![UBUNTU_KEYSERVER; "45F68D54BBE23FB3039B46E59766E084FB0F43D8",];
 const PCRE1_DOWNLOAD_URL_PREFIX: &str = "https://sourceforge.net/projects/pcre/files/pcre";
 const PCRE2_DOWNLOAD_URL_PREFIX: &str = "https://github.com/PCRE2Project/pcre2/releases/download";
 /// The default version of openssl to use if the `OPENSSL_VERSION` environment variable is not present
 const OPENSSL1_DEFAULT_VERSION: &str = "1.1.1w";
 const OPENSSL3_DEFAULT_VERSION: &str = "3.2.1";
-const OPENSSL_GPG_SERVER_AND_KEY_IDS: (&str, &str) = (
-    UBUNTU_KEYSERVER,
-    "\
-EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5 \
-A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C \
-8657ABB260F056B1E5190839D9C4D26D0E604491 \
-B7C1C14360F353A36862E4D5231C84CDDCC69C45 \
-95A9908DDFA16830BE9FB9003D30A3A9FF1360DC \
-7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C \
-E5E52560DD91C556DDBDA5D02064C53641C25E5D \
-C1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD",
-);
+const OPENSSL_GPG_SERVER_AND_KEY_IDS: [(&str, &str); 8] = server_and_keys![
+    UBUNTU_KEYSERVER;
+    "EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5",
+    "A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C",
+    "8657ABB260F056B1E5190839D9C4D26D0E604491",
+    "B7C1C14360F353A36862E4D5231C84CDDCC69C45",
+    "95A9908DDFA16830BE9FB9003D30A3A9FF1360DC",
+    "7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C",
+    "E5E52560DD91C556DDBDA5D02064C53641C25E5D",
+    "C1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD",
+];
 const OPENSSL_DOWNLOAD_URL_PREFIX: &str = "https://github.com/openssl/openssl/releases/download";
 /// The default version of NGINX to use if the `NGX_VERSION` environment variable is not present
 const NGX_DEFAULT_VERSION: &str = "1.24.0";
 
 /// Key 1: Konstantin Pavlov's public key. For Nginx 1.25.3 and earlier
 /// Key 2: Sergey Kandaurov's public key. For Nginx 1.25.4
 /// Key 3: Maxim Dounin's public key. At least used for Nginx 1.18.0
-const NGX_GPG_SERVER_AND_KEY_IDS: (&str, &str) = (
-    UBUNTU_KEYSERVER,
-    "\
-13C82A63B603576156E30A4EA0EA981B66B0D967 \
-D6786CE303D9A9022998DC6CC8464D549AF75C0A \
-B0F4253373F8F6F510D42178520A9993A1C052F8",
-);
+const NGX_GPG_SERVER_AND_KEY_IDS: [(&str, &str); 3] = server_and_keys![
+UBUNTU_KEYSERVER;
+    "13C82A63B603576156E30A4EA0EA981B66B0D967",
+    "D6786CE303D9A9022998DC6CC8464D549AF75C0A",
+    "B0F4253373F8F6F510D42178520A9993A1C052F8",
+];
 
 const NGX_DOWNLOAD_URL_PREFIX: &str = "https://nginx.org/download";
 
 /// If you are adding another dependency, you will need to add the server/public key tuple below.
-const ALL_SERVERS_AND_PUBLIC_KEY_IDS: [(&str, &str); 4] = [
-    ZLIB_GPG_SERVER_AND_KEY_ID,
-    PCRE2_GPG_SERVER_AND_KEY_ID,
-    OPENSSL_GPG_SERVER_AND_KEY_IDS,
-    NGX_GPG_SERVER_AND_KEY_IDS,
+const ALL_SERVERS_AND_PUBLIC_KEY_IDS: &[(&str, &str); 13] = constcat::concat_slices![ [(&str,&str)]:
+    &ZLIB_GPG_SERVER_AND_KEY_IDS,
+    &PCRE2_GPG_SERVER_AND_KEY_IDS,
+    &OPENSSL_GPG_SERVER_AND_KEY_IDS,
+    &NGX_GPG_SERVER_AND_KEY_IDS,
 ];
 
 /// List of configure switches specifying the modules to build nginx with
@@ -316,12 +322,14 @@ fn keys_indexed_by_key_server() -> HashMap<String, Vec<String>> {
     let mut map: HashMap<String, Vec<String>> = HashMap::new();
 
     for tuple in ALL_SERVERS_AND_PUBLIC_KEY_IDS {
-        let key = tuple.0.to_string();
-        let value: Vec<String> = tuple.1.split_whitespace().map(|s| s.to_string()).collect();
-        match map.get_mut(&key) {
-            Some(keys) => keys.extend(value),
+        let server = tuple.0.to_string();
+        let key = tuple.1.to_string();
+        match map.get_mut(&server) {
+            Some(keys) => {
+                keys.push(key);
+            }
             None => {
-                map.insert(key, value);
+                map.insert(server, vec![key]);
             }
         }
     }