Skip to content

Commit eb4d725

Browse files
JadKHaddadJadKHaddad
committed
dep(rng): updated rng_core + rng to version 0.10
Signed-off-by: Jad K. Haddad <jadkhaddad@gmail.com>
1 parent 0b86150 commit eb4d725

15 files changed

Lines changed: 444 additions & 136 deletions

‎Cargo.lock‎

Lines changed: 310 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ keywords = ["no_std", "embedded", "websockets", "zerocopy"]
1313
[dependencies]
1414
framez = { version = "0.4", default-features = false }
1515
embedded-io-async = { version = "0.7", default-features = false }
16-
rand_core = { version = "0.9", default-features = false }
17-
rand = { version = "0.9", default-features = false }
16+
rand_core = { version = "0.10", default-features = false }
17+
rand = { version = "0.10", default-features = false }
1818
thiserror = { version = "2", default-features = false }
1919
httparse = { version = "1", default-features = false }
2020
base64 = { version = "0.22", default-features = false }
2121
sha1 = { version = "0.10", default-features = false }
2222

2323
[dev-dependencies]
24-
rand = { version = "0.9", features = ["std_rng"] }
24+
rand = { version = "0.10", features = ["std_rng"] }
2525
embedded-io-adapters = { version = "0.7", default-features = false, features = [
2626
"tokio-1",
2727
] }

‎examples/autobahn-client.rs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
//! ```
66
77
use embedded_io_adapters::tokio_1::FromTokio;
8-
use rand::{SeedableRng, rngs::StdRng};
8+
use rand::{
9+
SeedableRng,
10+
rngs::{StdRng, SysRng},
11+
};
912
use tokio::net::TcpStream;
1013
use websocketz::{
1114
CloseCode, CloseFrame, Message, WebSocket, http::Header, next, options::ConnectOptions, send,
@@ -28,7 +31,7 @@ async fn connect<'buf>(
2831
let websocketz = WebSocket::connect::<16>(
2932
ConnectOptions::new_unchecked(path).with_headers(headers),
3033
FromTokio::new(stream),
31-
StdRng::from_os_rng(),
34+
StdRng::try_from_rng(&mut SysRng).unwrap(),
3235
read_buf,
3336
write_buf,
3437
fragments_buf,

‎examples/autobahn-server.rs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
//! ```
66
77
use embedded_io_adapters::tokio_1::FromTokio;
8-
use rand::{SeedableRng, rngs::StdRng};
8+
use rand::{
9+
SeedableRng,
10+
rngs::{StdRng, SysRng},
11+
};
912
use tokio::net::TcpListener;
1013
use websocketz::{Message, WebSocket, error::Error, next, options::AcceptOptions, send};
1114

@@ -27,7 +30,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
2730
let mut websocketz = WebSocket::accept::<16>(
2831
AcceptOptions::default(),
2932
FromTokio::new(stream),
30-
StdRng::from_os_rng(),
33+
StdRng::try_from_rng(&mut SysRng).unwrap(),
3134
&mut read_buf,
3235
&mut write_buf,
3336
&mut fragments_buf,

‎examples/client-callback.rs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ use std::time::Duration;
1010

1111
use embedded_io_adapters::tokio_1::FromTokio;
1212
use httparse::Header;
13-
use rand::{SeedableRng, rngs::StdRng};
13+
use rand::{
14+
SeedableRng,
15+
rngs::{StdRng, SysRng},
16+
};
1417
use tokio::net::TcpStream;
1518
use websocketz::{Message, WebSocket, http::Response, next, options::ConnectOptions};
1619

@@ -25,7 +28,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
2528
let read_buf = &mut [0u8; 8192];
2629
let write_buf = &mut [0u8; 8192];
2730
let fragments_buf = &mut [0u8; 8192];
28-
let rng = StdRng::from_os_rng();
31+
let rng = StdRng::try_from_rng(&mut SysRng).unwrap();
2932

3033
let (mut websocketz, custom) = WebSocket::connect_with(
3134
ConnectOptions::default()

‎examples/server-callback.rs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
88
use embedded_io_adapters::tokio_1::FromTokio;
99
use httparse::Header;
10-
use rand::{SeedableRng, rngs::StdRng};
10+
use rand::{
11+
SeedableRng,
12+
rngs::{StdRng, SysRng},
13+
};
1114
use tokio::net::TcpListener;
1215
use websocketz::{Message, WebSocket, http::Request, next, options::AcceptOptions};
1316

@@ -38,7 +41,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
3841
value: b"Server-Value",
3942
}]),
4043
FromTokio::new(stream),
41-
StdRng::from_os_rng(),
44+
StdRng::try_from_rng(&mut SysRng).unwrap(),
4245
&mut read_buf,
4346
&mut write_buf,
4447
&mut fragments_buf,

‎examples/simple.rs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
//! ```
66
77
use embedded_io_adapters::tokio_1::FromTokio;
8-
use rand::{SeedableRng, rngs::StdRng};
8+
use rand::{
9+
SeedableRng,
10+
rngs::{StdRng, SysRng},
11+
};
912
use tokio::net::TcpStream;
1013
use websocketz::{Message, WebSocket, http::Header, next, options::ConnectOptions};
1114

@@ -23,7 +26,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
2326
let read_buf = &mut [0u8; 8192 * 2];
2427
let write_buf = &mut [0u8; 8192 * 2];
2528
let fragments_buf = &mut [0u8; 8192 * 2];
26-
let rng = StdRng::from_os_rng();
29+
let rng = StdRng::try_from_rng(&mut SysRng).unwrap();
2730

2831
let mut websocketz = WebSocket::connect::<16>(
2932
ConnectOptions::default()

‎examples/split.rs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
//! ```
66
77
use embedded_io_adapters::tokio_1::FromTokio;
8-
use rand::{SeedableRng, rngs::StdRng};
8+
use rand::{
9+
SeedableRng,
10+
rngs::{StdRng, SysRng},
11+
};
912
use tokio::{
1013
io::{ReadHalf, WriteHalf},
1114
net::TcpStream,
@@ -30,7 +33,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
3033
let read_buf = &mut [0u8; 8192 * 2];
3134
let write_buf = &mut [0u8; 8192 * 2];
3235
let fragments_buf = &mut [0u8; 8192 * 2];
33-
let rng = StdRng::from_os_rng();
36+
let rng = StdRng::try_from_rng(&mut SysRng).unwrap();
3437

3538
let websocketz = WebSocket::connect::<16>(
3639
ConnectOptions::default(),

‎src/codec.rs‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use framez::{decode::Decoder, encode::Encoder};
2-
use rand::Rng;
3-
use rand_core::RngCore;
2+
use rand::RngExt;
3+
use rand_core::Rng;
44

55
use crate::{
66
Frame, FrameMut, Header, Message, OpCode,
@@ -241,7 +241,7 @@ impl<'buf, R> Decoder<'buf> for FramesCodec<R> {
241241
}
242242
}
243243

244-
impl<R: RngCore> FramesCodec<R> {
244+
impl<R: Rng> FramesCodec<R> {
245245
#[inline(always)]
246246
fn encode_inner<F>(
247247
&mut self,
@@ -287,7 +287,7 @@ impl<R: RngCore> FramesCodec<R> {
287287
}
288288
}
289289

290-
impl<R: RngCore> Encoder<Message<'_>> for FramesCodec<R> {
290+
impl<R: Rng> Encoder<Message<'_>> for FramesCodec<R> {
291291
type Error = FrameEncodeError;
292292

293293
fn encode(&mut self, item: Message, dst: &mut [u8]) -> Result<usize, Self::Error> {
@@ -301,7 +301,7 @@ impl<R: RngCore> Encoder<Message<'_>> for FramesCodec<R> {
301301
}
302302
}
303303

304-
impl<R: RngCore> Encoder<Frame<'_>> for FramesCodec<R> {
304+
impl<R: Rng> Encoder<Frame<'_>> for FramesCodec<R> {
305305
type Error = FrameEncodeError;
306306

307307
fn encode(&mut self, item: Frame, dst: &mut [u8]) -> Result<usize, Self::Error> {
@@ -434,7 +434,10 @@ mod tests {
434434
}
435435

436436
mod encode {
437-
use rand::{SeedableRng, rngs::StdRng};
437+
use rand::{
438+
SeedableRng,
439+
rngs::{StdRng, SysRng},
440+
};
438441

439442
use super::*;
440443

@@ -443,7 +446,7 @@ mod tests {
443446
let dst = &mut [0u8; 16];
444447
let message = Message::Binary(&[0; 24]);
445448

446-
let mut codec = FramesCodec::new(StdRng::from_os_rng());
449+
let mut codec = FramesCodec::new(StdRng::try_from_rng(&mut SysRng).unwrap());
447450

448451
let error = codec.encode(message, dst).unwrap_err();
449452

‎src/functions.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use embedded_io_async::{Read, Write};
22
use framez::state::{ReadState, WriteState};
3-
use rand::RngCore;
3+
use rand_core::Rng;
44

55
use crate::{
66
ConnectionState, Frame, Message, OnFrame, WebSocketCore,
@@ -14,10 +14,10 @@ pub struct ReadAutoCaller;
1414

1515
impl ReadAutoCaller {
1616
#[allow(clippy::too_many_arguments)]
17-
pub async fn call<'this, F, RW, Rng>(
17+
pub async fn call<'this, F, RW, RNG>(
1818
&self,
1919
auto: F,
20-
codec: &mut FramesCodec<Rng>,
20+
codec: &mut FramesCodec<RNG>,
2121
inner: &mut RW,
2222
read_state: &'this mut ReadState<'_>,
2323
write_state: &mut WriteState<'_>,
@@ -26,7 +26,7 @@ impl ReadAutoCaller {
2626
) -> Option<Result<Option<Message<'this>>, Error<RW::Error>>>
2727
where
2828
RW: Read + Write,
29-
Rng: RngCore,
29+
RNG: Rng,
3030
F: FnOnce(Frame<'_>) -> Result<OnFrame<'_>, ProtocolError> + 'static,
3131
{
3232
let frame = match framez::functions::maybe_next(read_state, codec, inner).await {
@@ -54,7 +54,7 @@ impl ReadAutoCaller {
5454
Err(err) => return Some(Err(Error::Read(ReadError::Protocol(err)))),
5555
};
5656

57-
WebSocketCore::<RW, Rng>::on_frame(fragments_state, frame)
57+
WebSocketCore::<RW, RNG>::on_frame(fragments_state, frame)
5858
.map(|result| result.map_err(Error::from))
5959
}
6060
}
@@ -64,10 +64,10 @@ pub struct ReadCaller;
6464

6565
impl ReadCaller {
6666
#[allow(clippy::too_many_arguments)]
67-
pub async fn call<'this, RW, Rng>(
67+
pub async fn call<'this, RW, RNG>(
6868
&self,
6969
_auto: (),
70-
codec: &mut FramesCodec<Rng>,
70+
codec: &mut FramesCodec<RNG>,
7171
inner: &mut RW,
7272
read_state: &'this mut ReadState<'_>,
7373
_write_state: &mut WriteState<'_>,
@@ -84,21 +84,21 @@ impl ReadCaller {
8484
None => return None,
8585
};
8686

87-
WebSocketCore::<RW, Rng>::on_frame(fragments_state, frame)
87+
WebSocketCore::<RW, RNG>::on_frame(fragments_state, frame)
8888
.map(|result| result.map_err(Error::from))
8989
}
9090
}
9191

92-
pub async fn send<RW, Rng>(
93-
codec: &mut FramesCodec<Rng>,
92+
pub async fn send<RW, RNG>(
93+
codec: &mut FramesCodec<RNG>,
9494
inner: &mut RW,
9595
write_state: &mut WriteState<'_>,
9696
state: &mut ConnectionState,
9797
message: Message<'_>,
9898
) -> Result<(), Error<RW::Error>>
9999
where
100100
RW: Write,
101-
Rng: RngCore,
101+
RNG: Rng,
102102
{
103103
if state.closed {
104104
return Err(Error::Write(WriteError::ConnectionClosed));
@@ -113,8 +113,8 @@ where
113113
Ok(())
114114
}
115115

116-
pub async fn send_fragmented<RW, Rng>(
117-
codec: &mut FramesCodec<Rng>,
116+
pub async fn send_fragmented<RW, RNG>(
117+
codec: &mut FramesCodec<RNG>,
118118
inner: &mut RW,
119119
write_state: &mut WriteState<'_>,
120120
state: &mut ConnectionState,
@@ -123,7 +123,7 @@ pub async fn send_fragmented<RW, Rng>(
123123
) -> Result<(), Error<RW::Error>>
124124
where
125125
RW: Write,
126-
Rng: RngCore,
126+
RNG: Rng,
127127
{
128128
if state.closed {
129129
return Err(Error::Write(WriteError::ConnectionClosed));

0 commit comments

Comments
 (0)