poly1305: rename poly1305_force_soft => poly1305_backend="soft"

Changes the `cfg`-based override to force usage of the soft backend
to use `poly1305_backend` following a similar change in `polyval` (#259)

Author: tarcieri

.github/workflows/poly1305.yml

@@ -108,7 +108,7 @@ jobs:
   # Tests for the portable software backend
   soft:
     env:
-      RUSTFLAGS: "-Dwarnings --cfg poly1305_force_soft"
+      RUSTFLAGS: '-Dwarnings --cfg poly1305_backend="soft"'
     runs-on: ubuntu-latest
     strategy:
       matrix:

poly1305/Cargo.toml

@@ -24,4 +24,7 @@ hex-literal = "1"
 
 [lints.rust.unexpected_cfgs]
 level = "warn"
-check-cfg = ["cfg(fuzzing)", "cfg(poly1305_force_soft)"]
+check-cfg = [
+    'cfg(fuzzing)',
+    'cfg(poly1305_backend, values("soft"))'
+]

poly1305/src/backend.rs

@@ -2,13 +2,13 @@
 
 #[cfg(all(
     any(target_arch = "x86", target_arch = "x86_64"),
-    not(poly1305_force_soft)
+    not(poly1305_backend = "soft")
 ))]
 pub(crate) mod avx2;
 
 #[cfg(all(
     any(target_arch = "x86", target_arch = "x86_64"),
-    not(poly1305_force_soft)
+    not(poly1305_backend = "soft")
 ))]
 pub(crate) mod autodetect;
 

poly1305/src/lib.rs

@@ -19,21 +19,21 @@ mod backend;
 
 #[cfg(all(
     any(target_arch = "x86", target_arch = "x86_64"),
-    not(poly1305_force_soft),
+    not(poly1305_backend = "soft"),
     target_feature = "avx2", // Fuzz tests bypass AVX2 autodetection code
     any(fuzzing, test)
 ))]
 mod fuzz;
 
 #[cfg(all(
     any(target_arch = "x86", target_arch = "x86_64"),
-    not(poly1305_force_soft)
+    not(poly1305_backend = "soft")
 ))]
 use crate::backend::autodetect::State;
 
 #[cfg(not(all(
     any(target_arch = "x86", target_arch = "x86_64"),
-    not(poly1305_force_soft)
+    not(poly1305_backend = "soft")
 )))]
 use crate::backend::soft::State;
 
@@ -121,7 +121,7 @@ impl Debug for Poly1305 {
 
 #[cfg(all(
     any(target_arch = "x86", target_arch = "x86_64"),
-    not(poly1305_force_soft),
+    not(poly1305_backend = "soft"),
     target_feature = "avx2", // Fuzz tests bypass AVX2 autodetection code
     any(fuzzing, test)
 ))]