Skip to content

Commit 6de98ff

Browse files
committed
lpc55-rng: cleanup some nonsense
Not sure what I was thinking here.
1 parent 5ec42a6 commit 6de98ff

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

drv/lpc55-rng/src/main.rs

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#![no_std]
1010
#![no_main]
1111

12-
use core::mem::size_of;
12+
use core::{mem::size_of, usize};
1313
use drv_lpc55_syscon_api::Syscon;
1414
use drv_rng_api::RngError;
1515
use idol_runtime::{ClientError, NotificationHandler, RequestError};
@@ -33,17 +33,14 @@ where
3333
T: SeedableRng,
3434
{
3535
fn new(mut reseeder: Lpc55Rng, threshold: usize) -> Result<Self, Error> {
36-
use ::core::usize::MAX;
37-
38-
let threshold = if threshold == 0 { MAX } else { threshold };
39-
40-
// try_trait_v2 is still experimental
41-
let inner = match T::from_rng(&mut reseeder) {
42-
Ok(rng) => rng,
43-
Err(err) => return Err(err),
36+
let threshold = if threshold == 0 {
37+
usize::MAX
38+
} else {
39+
threshold
4440
};
41+
4542
Ok(ReseedingRng {
46-
inner,
43+
inner: T::from_rng(&mut reseeder)?,
4744
reseeder,
4845
threshold,
4946
bytes_until_reseed: threshold,
@@ -68,11 +65,7 @@ where
6865
fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
6966
let num_bytes = dest.len();
7067
if num_bytes >= self.bytes_until_reseed || num_bytes >= self.threshold {
71-
// try_trait_v2 is still experimental
72-
self.inner = match T::from_rng(&mut self.reseeder) {
73-
Ok(rng) => rng,
74-
Err(e) => return Err(e),
75-
};
68+
self.inner = T::from_rng(&mut self.reseeder)?;
7669
self.bytes_until_reseed = self.threshold;
7770
} else {
7871
self.bytes_until_reseed -= num_bytes;

0 commit comments

Comments
 (0)