eliott/libsignal
1
0
Fork 0
mirror of https://github.com/signalapp/libsignal.git synced 2026-04-25 17:25:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prefer expect() to unwrap() in many crates

Browse Source 
(and avoid either in a few cases)
This commit is contained in:
Jordan Rose
2025-11-21 12:06:45 -08:00
committed by GitHub
parent a0b94cf25d
commit 1bf4a3c6f5
25 changed files with 57 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.clippy.toml
View File

@@ -7,5 +7,5 @@ disallowed-methods = [
{ path = "jni::JNIEnv::call_static_method_unchecked", reason = "use helper method instead" },
{ path = "jni::JNIEnv::new_object", reason = "use helper method instead" },
{ path = "jni::JNIEnv::new_object_unchecked", reason = "use helper method instead" },
".." # keep any defaults
]
allow-unwrap-in-tests = true

4
rust/account-keys/src/lib.rs
View File

@@ -3,6 +3,8 @@
// SPDX-License-Identifier: AGPL-3.0-only
//
#![warn(clippy::unwrap_used)]
mod backup;
mod error;
mod hash;
@@ -31,7 +33,7 @@ impl AccountEntropyPool {
const ALPHABET: &'static [u8] = b"0123456789abcdefghijklmnopqrstuvwxyz";
pub fn generate(rng: &mut impl Rng) -> AccountEntropyPool {
let alphabet_dist = slice::Choose::new(Self::ALPHABET).unwrap();
let alphabet_dist = slice::Choose::new(Self::ALPHABET).expect("non-empty");
let entropy_pool: [u8; Self::LENGTH] = std::array::from_fn(|_| *rng.sample(alphabet_dist));
Self { entropy_pool }
}

5
rust/core/src/address.rs
View File

@@ -757,7 +757,10 @@ impl fmt::Display for DeviceId {
impl rand::distr::Distribution<DeviceId> for rand::distr::StandardUniform {
fn sample<R: rand::Rng + ?Sized>(&self, rng: &mut R) -> DeviceId {
DeviceId(NonZeroU8::new(rng.random_range(1..=MAX_VALID_DEVICE_ID)).unwrap())
DeviceId(
NonZeroU8::new(rng.random_range(1..=MAX_VALID_DEVICE_ID))
.expect("guaranteed by random_range"),
)
}
}

2
rust/core/src/lib.rs
View File

@@ -3,6 +3,8 @@
// SPDX-License-Identifier: AGPL-3.0-only
//
#![warn(clippy::unwrap_used)]
mod address;
// Not exporting the members because they have overly-generic names.
pub mod curve;

2
rust/device-transfer/src/lib.rs
View File

@@ -6,7 +6,7 @@
//! Support logic for Signal's device-to-device transfer feature.
#![deny(unsafe_code)]
#![warn(missing_docs)]
#![warn(missing_docs, clippy::unwrap_used)]
use std::fmt;
use std::time::{Duration, SystemTime};

2
rust/keytrans/src/lib.rs
View File

@@ -3,7 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0-only
//
#![cfg_attr(not(test), warn(clippy::unwrap_used))]
#![warn(clippy::unwrap_used)]
mod commitments;
mod guide;

2
rust/media/src/lib.rs
View File

@@ -3,4 +3,6 @@
// SPDX-License-Identifier: AGPL-3.0-only
//
#![warn(clippy::unwrap_used)]
pub mod sanitize;

2
rust/message-backup/src/lib.rs
View File

@@ -7,6 +7,8 @@
//!
//! Contains code to read and validate message backup files.
#![warn(clippy::unwrap_used)]
use std::time::Duration;
use futures::AsyncRead;

1
rust/message-backup/src/proto.rs
View File

@@ -7,6 +7,7 @@
// self.special_fields.cached_size().set(my_size as u32)
// which isn't obviously correct! But protobuf doesn't support messages that big anyway.
#![expect(clippy::cast_possible_truncation)]
#![expect(clippy::unwrap_used)]
include!(concat!(env!("OUT_DIR"), "/protos/mod.rs"));

6
rust/poksho/src/sign.rs
View File

@@ -52,11 +52,7 @@ mod tests {
use super::*;
#[test]
#[expect(
clippy::cast_possible_truncation,
clippy::needless_range_loop,
clippy::unwrap_used
)]
#[expect(clippy::cast_possible_truncation, clippy::needless_range_loop)]
fn test_signature() {
let mut block64 = [0u8; 64];
let mut block32 = [0u8; 32];

3
rust/svrb/src/lib.rs
View File

@@ -2,6 +2,9 @@
// Copyright 2023 Signal Messenger, LLC.
// SPDX-License-Identifier: AGPL-3.0-only
//
#![warn(clippy::unwrap_used)]
use std::collections::BTreeMap;
use std::io::Write;
use std::iter::repeat_with;

2
rust/usernames/src/lib.rs
View File

@@ -3,6 +3,8 @@
// SPDX-License-Identifier: AGPL-3.0-only
//
#![warn(clippy::unwrap_used)]
pub use error::{ProofVerificationFailure, UsernameError};
pub use username::*;

20
rust/usernames/src/username.rs
View File

@@ -4,12 +4,13 @@
//
use std::fmt::{Debug, Display, Formatter};
use std::ops::{Add, Range, RangeInclusive};
use std::ops::{Range, RangeInclusive};
use std::str::FromStr;
use std::sync::LazyLock;
use curve25519_dalek::ristretto::{CompressedRistretto, RistrettoPoint};
use curve25519_dalek::scalar::Scalar;
use curve25519_dalek::traits::MultiscalarMul;
use poksho::args::{PointArgs, ScalarArgs};
use poksho::{PokshoError, Statement};
use rand::Rng;
@@ -161,7 +162,6 @@ impl Username {
) -> Result<Vec<String>, UsernameError> {
validate_nickname(nickname, &limits)?;
let candidates = random_discriminators(rng, &CANDIDATES_PER_RANGE, &DISCRIMINATOR_RANGES)
.unwrap()
.iter()
.map(|d| Self::format_parts(nickname, d))
.collect();
@@ -173,12 +173,10 @@ impl Username {
}
fn hash_from_scalars(scalars: &[Scalar]) -> RistrettoPoint {
BASE_POINTS
.iter()
.zip(scalars)
.map(|(point, scalar)| point * scalar)
.reduce(RistrettoPoint::add)
.unwrap()
// Will panic if the number of scalars doesn't match the number of base points.
// If we ever change the encoding to not use a fixed number of scalars, this will need to be
// updated.
RistrettoPoint::multiscalar_mul(scalars, BASE_POINTS.iter())
}
fn make_scalar_args(scalars: &[Scalar]) -> ScalarArgs {
@@ -330,14 +328,14 @@ fn random_discriminators<R: Rng>(
rng: &mut R,
count_per_range: &[usize],
ranges: &[Range<usize>],
) -> Result<Vec<usize>, UsernameError> {
) -> Vec<usize> {
assert!(count_per_range.len() <= ranges.len(), "Not enough ranges");
let total_count: usize = count_per_range.iter().sum();
let mut results = Vec::with_capacity(total_count);
for (n, range) in count_per_range.iter().zip(ranges) {
results.extend(gen_range(rng, range, *n));
}
Ok(results)
results
}
fn gen_range<'a, R: Rng>(
@@ -520,7 +518,7 @@ mod test {
#[test]
fn generate_discriminators() {
let mut rng = rand::rng();
let ds = random_discriminators(&mut rng, &[4, 3, 2, 1], &DISCRIMINATOR_RANGES).unwrap();
let ds = random_discriminators(&mut rng, &[4, 3, 2, 1], &DISCRIMINATOR_RANGES);
assert!(DISCRIMINATOR_RANGES[0].contains(&ds[0]));
assert!(DISCRIMINATOR_RANGES[0].contains(&ds[1]));
assert!(DISCRIMINATOR_RANGES[0].contains(&ds[2]));

2
rust/zkcredential/src/endorsements.rs
View File

@@ -374,7 +374,7 @@ impl EndorsementResponse {
scalar_args.add("sk_prime", private_key.sk_prime);
let proof = statement
.prove(&scalar_args, &point_args, b"", &randomness)
.unwrap();
.expect("valid proof");
EndorsementResponse { R, proof }
}

2
rust/zkcredential/src/issuance.rs
View File

@@ -252,7 +252,7 @@ impl<'a> IssuanceProofBuilder<'a> {
self.authenticated_message,
&sho.squeeze_and_ratchet_as_array::<RANDOMNESS_LEN>(),
)
.unwrap();
.expect("valid proof");
IssuanceProof {
poksho_proof,
credential,

2
rust/zkcredential/src/issuance/blind.rs
View File

@@ -491,7 +491,7 @@ impl BlindedIssuanceProofBuilder<'_> {
self.inner.authenticated_message,
&sho.squeeze_and_ratchet_as_array::<RANDOMNESS_LEN>(),
)
.unwrap();
.expect("valid proof");
BlindedIssuanceProof {
poksho_proof,
credential,

2
rust/zkcredential/src/lib.rs
View File

@@ -36,7 +36,7 @@
//! [paper]: https://eprint.iacr.org/2019/1416
#![allow(non_snake_case)]
#![warn(missing_docs)]
#![warn(missing_docs, clippy::unwrap_used)]
/// A zkcredential operation failed to verify.
#[derive(Debug, thiserror::Error, displaydoc::Display)]

2
rust/zkcredential/src/presentation.rs
View File

@@ -547,7 +547,7 @@ impl<'a> PresentationProofBuilder<'a> {
self.core.authenticated_message,
&sho.squeeze_and_ratchet_as_array::<RANDOMNESS_LEN>(),
)
.unwrap();
.expect("valid proof");
PresentationProof {
commitments,

2
rust/zkgroup/src/api/profiles/profile_key_version.rs
View File

@@ -37,7 +37,7 @@ impl Serialize for ProfileKeyVersion {
where
S: Serializer,
{
let mut seq = serializer.serialize_tuple(self.ascii.len()).unwrap();
let mut seq = serializer.serialize_tuple(self.ascii.len())?;
for b in self.ascii.iter() {
seq.serialize_element(b)?;
}

5
rust/zkgroup/src/crypto/credentials.rs
View File

@@ -27,8 +27,9 @@ use crate::{
NUM_AUTH_CRED_ATTRIBUTES, NUM_PROFILE_KEY_CRED_ATTRIBUTES, NUM_RECEIPT_CRED_ATTRIBUTES,
};
static SYSTEM_PARAMS: LazyLock<SystemParams> =
LazyLock::new(|| crate::deserialize::<SystemParams>(SystemParams::SYSTEM_HARDCODED).unwrap());
static SYSTEM_PARAMS: LazyLock<SystemParams> = LazyLock::new(|| {
crate::deserialize(SystemParams::SYSTEM_HARDCODED).expect("valid hardcoded params")
});
const NUM_SUPPORTED_ATTRS: usize = 6;
#[derive(Copy, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]

5
rust/zkgroup/src/crypto/profile_key_commitment.rs
View File

@@ -17,8 +17,9 @@ use crate::common::sho::*;
use crate::common::simple_types::*;
use crate::crypto::profile_key_struct;
static SYSTEM_PARAMS: LazyLock<SystemParams> =
LazyLock::new(|| crate::deserialize::<SystemParams>(&SystemParams::SYSTEM_HARDCODED).unwrap());
static SYSTEM_PARAMS: LazyLock<SystemParams> = LazyLock::new(|| {
crate::deserialize(&SystemParams::SYSTEM_HARDCODED).expect("valid hardcoded params")
});
#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, PartialDefault)]
pub struct SystemParams {

5
rust/zkgroup/src/crypto/profile_key_encryption.rs
View File

@@ -18,8 +18,9 @@ use crate::common::sho::*;
use crate::common::simple_types::*;
use crate::crypto::profile_key_struct;
static SYSTEM_PARAMS: LazyLock<SystemParams> =
LazyLock::new(|| crate::deserialize::<SystemParams>(&SystemParams::SYSTEM_HARDCODED).unwrap());
static SYSTEM_PARAMS: LazyLock<SystemParams> = LazyLock::new(|| {
crate::deserialize(&SystemParams::SYSTEM_HARDCODED).expect("valid hardcoded params")
});
#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, PartialDefault)]
pub struct SystemParams {

10
rust/zkgroup/src/crypto/proofs.rs
View File

@@ -140,7 +140,7 @@ impl ProfileKeyCredentialRequestProof {
&[],
&sho.squeeze_as_array::<RANDOMNESS_LEN>(),
)
.unwrap();
.expect("valid proof");
ProfileKeyCredentialRequestProof { poksho_proof }
}
@@ -262,7 +262,7 @@ impl ExpiringProfileKeyCredentialIssuanceProof {
&[],
&sho.squeeze_as_array::<RANDOMNESS_LEN>(),
)
.unwrap();
.expect("valid proof");
ExpiringProfileKeyCredentialIssuanceProof { poksho_proof }
}
@@ -390,7 +390,7 @@ impl ReceiptCredentialIssuanceProof {
&[],
&sho.squeeze_as_array::<RANDOMNESS_LEN>(),
)
.unwrap();
.expect("valid proof");
Self { poksho_proof }
}
@@ -564,7 +564,7 @@ impl ExpiringProfileKeyCredentialPresentationProof {
&[],
&sho.squeeze_as_array::<RANDOMNESS_LEN>(),
)
.unwrap();
.expect("valid proof");
ExpiringProfileKeyCredentialPresentationProof {
C_y1,
@@ -723,7 +723,7 @@ impl ReceiptCredentialPresentationProof {
&[],
&sho.squeeze_as_array::<RANDOMNESS_LEN>(),
)
.unwrap();
.expect("valid proof");
Self {
C_x0,

5
rust/zkgroup/src/crypto/uid_encryption.rs
View File

@@ -17,8 +17,9 @@ use crate::common::errors::*;
use crate::common::sho::*;
use crate::crypto::uid_struct;
static SYSTEM_PARAMS: LazyLock<SystemParams> =
LazyLock::new(|| crate::deserialize::<SystemParams>(&SystemParams::SYSTEM_HARDCODED).unwrap());
static SYSTEM_PARAMS: LazyLock<SystemParams> = LazyLock::new(|| {
crate::deserialize(&SystemParams::SYSTEM_HARDCODED).expect("valid hardcoded params")
});
#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, PartialDefault)]
pub struct SystemParams {

1
rust/zkgroup/src/lib.rs
View File

@@ -3,6 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0-only
//
#![warn(clippy::unwrap_used)]
#![deny(unsafe_code)]
pub mod api;