From 4960d5b702fedd8eb89e57bd8ceec8ed26b6ef3a Mon Sep 17 00:00:00 2001 From: Vlad Semenov Date: Tue, 7 Mar 2023 23:12:40 +0300 Subject: [PATCH 1/2] default Dalek32 backend on unknown platform --- build.rs | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/build.rs b/build.rs index da4b82621..1211c1e68 100644 --- a/build.rs +++ b/build.rs @@ -14,20 +14,23 @@ fn lotto_curve25519_dalek_bits() -> DalekBits { use platforms::target::PointerWidth; let target_triplet = std::env::var("TARGET").unwrap(); - let platform = platforms::Platform::find(&target_triplet).unwrap(); - - #[allow(clippy::match_single_binding)] - match platform.target_arch { - //Issues: 449 and 456 - //TODO(Arm): Needs tests + benchmarks to back this up - //platforms::target::Arch::Arm => DalekBits::Dalek64, - //TODO(Wasm32): Needs tests + benchmarks to back this up - //platforms::target::Arch::Wasm32 => DalekBits::Dalek64, - _ => match platform.target_pointer_width { - PointerWidth::U64 => DalekBits::Dalek64, - PointerWidth::U32 => DalekBits::Dalek32, - _ => DalekBits::Dalek32, - }, + if let Some(platform) = platforms::Platform::find(&target_triplet) { + + #[allow(clippy::match_single_binding)] + match platform.target_arch { + //Issues: 449 and 456 + //TODO(Arm): Needs tests + benchmarks to back this up + //platforms::target::Arch::Arm => DalekBits::Dalek64, + //TODO(Wasm32): Needs tests + benchmarks to back this up + //platforms::target::Arch::Wasm32 => DalekBits::Dalek64, + _ => match platform.target_pointer_width { + PointerWidth::U64 => DalekBits::Dalek64, + PointerWidth::U32 => DalekBits::Dalek32, + _ => DalekBits::Dalek32, + }, + } + } else { + DalekBits::Dalek32 } } From 5ac89d463d26226901c22c10a4b0ccfbad440105 Mon Sep 17 00:00:00 2001 From: Vlad Semenov Date: Thu, 9 Mar 2023 12:34:56 +0300 Subject: [PATCH 2/2] cargo fmt --- build.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/build.rs b/build.rs index 1211c1e68..76b280e92 100644 --- a/build.rs +++ b/build.rs @@ -15,7 +15,6 @@ fn lotto_curve25519_dalek_bits() -> DalekBits { let target_triplet = std::env::var("TARGET").unwrap(); if let Some(platform) = platforms::Platform::find(&target_triplet) { - #[allow(clippy::match_single_binding)] match platform.target_arch { //Issues: 449 and 456