diff --git a/ipa-core/Cargo.toml b/ipa-core/Cargo.toml index 7d2216df6..71e98d623 100644 --- a/ipa-core/Cargo.toml +++ b/ipa-core/Cargo.toml @@ -6,7 +6,7 @@ version = "0.1.0" # rust:slim-bullseye docker image is available. # 2. Update the rust version used for draft in # https://github.com/private-attribution/draft/blob/main/sidecar/ansible/provision.yaml. -rust-version = "1.82.0" +rust-version = "1.84.0" edition = "2021" build = "build.rs" diff --git a/ipa-core/src/cli/clientconf.rs b/ipa-core/src/cli/clientconf.rs index 0b376dad0..8d50a6337 100644 --- a/ipa-core/src/cli/clientconf.rs +++ b/ipa-core/src/cli/clientconf.rs @@ -189,7 +189,7 @@ fn find_file_with_extension(path: &PathBuf, extension: &str) -> Option { if path.is_file() && path .extension() - .map_or(false, |ext| ext.to_str().unwrap() == extension) + .is_some_and(|ext| ext.to_str().unwrap() == extension) { return Some(path.file_stem().unwrap().to_str().unwrap().to_string()); } diff --git a/ipa-core/src/protocol/basics/mul/dzkp_malicious.rs b/ipa-core/src/protocol/basics/mul/dzkp_malicious.rs index acccd670a..87e987920 100644 --- a/ipa-core/src/protocol/basics/mul/dzkp_malicious.rs +++ b/ipa-core/src/protocol/basics/mul/dzkp_malicious.rs @@ -28,8 +28,8 @@ use crate::{ /// back via the error response /// ## Panics /// Panics if the mutex is found to be poisoned -pub async fn zkp_multiply<'a, B, F, const N: usize>( - ctx: DZKPUpgradedMaliciousContext<'a, B>, +pub async fn zkp_multiply( + ctx: DZKPUpgradedMaliciousContext<'_, B>, record_id: RecordId, a: &Replicated, b: &Replicated, diff --git a/ipa-core/src/protocol/ipa_prf/oprf_padding/insecure.rs b/ipa-core/src/protocol/ipa_prf/oprf_padding/insecure.rs index d37edfecb..cddb3e720 100644 --- a/ipa-core/src/protocol/ipa_prf/oprf_padding/insecure.rs +++ b/ipa-core/src/protocol/ipa_prf/oprf_padding/insecure.rs @@ -385,7 +385,7 @@ mod test { const CHI2_INV_LB: f64 = 10_686.0; let mut rng = StdRng::seed_from_u64(seed); - let mut sample = [0_f64; N]; + let mut sample = vec![0_f64; N]; let dp = Dp::new(f64::from(epsilon), delta, f64::from(cap)).unwrap(); #[allow(clippy::cast_precision_loss)] let n = N as f64; @@ -433,7 +433,7 @@ mod test { #[allow(clippy::cast_precision_loss)] for epsilon in 1..11_u8 { let mut rng = thread_rng(); - let mut sample = [0; N]; + let mut sample = vec![0; N]; let dp = DiscreteDp::new(f64::from(epsilon), delta, f64::from(cap)).unwrap(); let n = N as f64; dp.apply(&mut sample, &mut rng); diff --git a/ipa-core/src/report/ipa.rs b/ipa-core/src/report/ipa.rs index cfaf4349f..7dfcabbb1 100644 --- a/ipa-core/src/report/ipa.rs +++ b/ipa-core/src/report/ipa.rs @@ -516,8 +516,8 @@ where /// # Panics /// If report length does not fit in `u16`. pub fn encrypted_len(&self) -> u16 { - let len = EncryptedOprfReport::::SITE_DOMAIN_OFFSET - + self.site_domain.as_bytes().len(); + let len = + EncryptedOprfReport::::SITE_DOMAIN_OFFSET + self.site_domain.len(); len.try_into().unwrap() } diff --git a/ipa-core/src/test_fixture/world.rs b/ipa-core/src/test_fixture/world.rs index 601eede12..f05fb7578 100644 --- a/ipa-core/src/test_fixture/world.rs +++ b/ipa-core/src/test_fixture/world.rs @@ -878,7 +878,7 @@ impl ShardWorld { } /// See `Runner` above. - async fn run_either<'a, C, A, O, H, R>( + async fn run_either( contexts: [C; 3], span: Span, input_shares: [A; 3],