Merge #104: Fix build on 1.48.0

efdc72f fix build on 1.48.0 (Andrew Poelstra)
e0b8c82 ci: actually run tests on alternate compilers (Andrew Poelstra)

Pull request description:

  #103 introduced a `panic` into a constfn; prior to that there were some loops using the new `IntoIter` implementations on arrays. Neither built with 1.48. This PR fixes these.

  This was not noticed because
  * In Github Actions we introduced the `DO_FEATURE_MATRIX` variabe but did not set it for the beta and 1.48 compiler runs, so we were not actually testing anything with those compilers
  * In my local CI script I was caching environments and did not feed the compiler into the key of a hashmap, resulting in tests running only on a single compiler (which happened to be nightly, which is the only compiler that I had put a lot of work into specifically ensuring was being used)

ACKs for top commit:
  tcharding:
    ACK efdc72f

Tree-SHA512: 215ca8265d953071374296800bb024c6cfd305fa08334ff44438e534a85f534587609d811fcbeb7ba6438faa0f790b8bcdf3f8000ef03b7e942c78c9cdbe0008

Author: apoelstra

.github/workflows/rust.yml

@@ -32,6 +32,8 @@ jobs:
       - name: Checkout Toolchain
         uses: dtolnay/rust-toolchain@beta
       - name: Running test script
+        env:
+          DO_FEATURE_MATRIX: true
         run: ./contrib/test.sh
 
   Nightly:
@@ -62,6 +64,8 @@ jobs:
       - name: Checkout Toolchain
         uses: dtolnay/[email protected]
       - name: Running test script
+        env:
+          DO_FEATURE_MATRIX: true
         run: ./contrib/test.sh
 
   EmbeddedWithAlloc:

contrib/test.sh

@@ -5,9 +5,6 @@
 set -eu
 set -x
 
-# "arrayvec" feature breaks the MSRV, its added manually in DO_FEATURE_MATRIX loop below.
-FEATURES="std alloc"
-
 # Some tests require certain toolchain types.
 NIGHTLY=false
 MSRV=false
@@ -52,8 +49,7 @@ if [ "${DO_FEATURE_MATRIX-false}" = true ]; then
     build_and_test "alloc"
     build_and_test "std alloc"
     # arrayvec breaks the MSRV
-    if [ $MSRV = false
-       ]; then
+    if [ $MSRV = false ]; then
         build_and_test "arrayvec"
         build_and_test "std arrayvec"
         build_and_test "alloc arrayvec"

src/primitives/gf32.rs

@@ -411,8 +411,8 @@ mod tests {
 
     #[test]
     fn from_char() {
-        for c in CHARS_LOWER {
-            assert!(Fe32::from_char(c).is_ok())
+        for c in &CHARS_LOWER[..] {
+            assert!(Fe32::from_char(*c).is_ok())
         }
     }
 
@@ -426,8 +426,8 @@ mod tests {
 
     #[test]
     fn mul_zero() {
-        for c in CHARS_LOWER {
-            let fe = Fe32::from_char(c).unwrap();
+        for c in &CHARS_LOWER[..] {
+            let fe = Fe32::from_char(*c).unwrap();
             assert_eq!(fe._mul(Fe32::Q), Fe32::Q) // Fe32::Q == Fe32(0)
         }
     }
@@ -446,8 +446,8 @@ mod tests {
 
     #[test]
     fn mul_one() {
-        for c in CHARS_LOWER {
-            let fe = Fe32::from_char(c).unwrap();
+        for c in &CHARS_LOWER[..] {
+            let fe = Fe32::from_char(*c).unwrap();
             assert_eq!(fe * Fe32::P, fe) // Fe32::P == Fe32(1)
         }
     }

src/primitives/hrp.rs

@@ -46,23 +46,22 @@ impl Hrp {
 
     /// Parses the human-readable part (see [`Hrp::parse`] for full docs).
     ///
-    /// # Panics
-    ///
-    /// If the string is invalid as defined by BIP-173.
+    /// Does not check that `hrp` is valid according to BIP-173 but does check for valid ASCII
+    /// values, replacing any invalid characters with `X`.
     pub const fn parse_unchecked(hrp: &str) -> Self {
         let mut new = Hrp { buf: [0_u8; MAX_HRP_LEN], size: 0 };
         let hrp_bytes = hrp.as_bytes();
 
         let mut i = 0;
         // Funky code so we can be const.
         while i < hrp.len() {
-            let b = hrp_bytes[i];
+            let mut b = hrp_bytes[i];
             // Valid subset of ASCII
             if b < 33 || b > 126 {
-                panic!("invalid hrp");
+                b = b'X';
             }
 
-            new.buf[i] = hrp_bytes[i];
+            new.buf[i] = b;
             new.size += 1;
             i += 1;
         }