mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-05 13:57:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Update to nanorand 0.6.1

Browse source
This commit is contained in:
Nikolay Kim 2021-10-06 20:32:32 +06:00
parent b3fd4f6b2a
commit 777b1407e8
4 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ntex/CHANGES.md
View file

@ -1,5 +1,9 @@
# Changes # Changes
## [0.4.2] - 2021-10-06
* Update to nanorand 0.6.1
## [0.4.1] - 2021-09-27 ## [0.4.1] - 2021-09-27
* server: Send `ServerStatus::WorkerFailed` update if worker is failed * server: Send `ServerStatus::WorkerFailed` update if worker is failed

4
ntex/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "ntex" name = "ntex"
version = "0.4.1" version = "0.4.2"
authors = ["ntex contributors <team@ntex.rs>"] authors = ["ntex contributors <team@ntex.rs>"]
description = "Framework for composable network services" description = "Framework for composable network services"
readme = "README.md" readme = "README.md"
@ -60,7 +60,7 @@ futures-sink = { version = "0.3.16", default-features = false, features = ["allo
log = "0.4" log = "0.4"
mio = "0.7.11" mio = "0.7.11"
num_cpus = "1.13" num_cpus = "1.13"
nanorand = { version = "0.5", default-features = false, features = ["std", "wyrand"] } nanorand = { version = "0.6.1", default-features = false, features = ["std", "wyrand"] }
pin-project-lite = "0.2" pin-project-lite = "0.2"
regex = { version = "1.5.4", default-features = false, features = ["std"] } regex = { version = "1.5.4", default-features = false, features = ["std"] }
sha-1 = "0.9" sha-1 = "0.9"

2
ntex/src/http/client/ws.rs
View file

@ -3,7 +3,7 @@ use std::{convert::TryFrom, fmt, net::SocketAddr, rc::Rc, str};
#[cfg(feature = "cookie")] #[cfg(feature = "cookie")]
use coo_kie::{Cookie, CookieJar}; use coo_kie::{Cookie, CookieJar};
use nanorand::{WyRand, RNG}; use nanorand::{WyRand, Rng};
use crate::codec::{AsyncRead, AsyncWrite, Framed}; use crate::codec::{AsyncRead, AsyncWrite, Framed};
use crate::framed::{DispatchItem, Dispatcher, State}; use crate::framed::{DispatchItem, Dispatcher, State};

13
ntex/src/ws/frame.rs
View file

@ -1,7 +1,7 @@
use std::convert::TryFrom; use std::convert::TryFrom;
use log::debug; use log::debug;
use nanorand::{WyRand, RNG}; use nanorand::{Rng, WyRand};
use super::proto::{CloseCode, CloseReason, OpCode}; use super::proto::{CloseCode, CloseReason, OpCode};
use super::{mask::apply_mask, ProtocolError}; use super::{mask::apply_mask, ProtocolError};
@ -77,8 +77,7 @@ impl Parser {
return Ok(None); return Ok(None);
} }
let mask = let mask = u32::from_le_bytes(TryFrom::try_from(&src[idx..idx + 4]).unwrap());
u32::from_le_bytes(TryFrom::try_from(&src[idx..idx + 4]).unwrap());
idx += 4; idx += 4;
Some(mask) Some(mask)
} else { } else {
@ -226,18 +225,14 @@ mod tests {
payload: Bytes, payload: Bytes,
} }
fn is_none( fn is_none(frm: &Result<Option<(bool, OpCode, Option<BytesMut>)>, ProtocolError>) -> bool {
frm: &Result<Option<(bool, OpCode, Option<BytesMut>)>, ProtocolError>,
) -> bool {
match *frm { match *frm {
Ok(None) => true, Ok(None) => true,
_ => false, _ => false,
} }
} }
fn extract( fn extract(frm: Result<Option<(bool, OpCode, Option<BytesMut>)>, ProtocolError>) -> F {
frm: Result<Option<(bool, OpCode, Option<BytesMut>)>, ProtocolError>,
) -> F {
match frm { match frm {
Ok(Some((finished, opcode, payload))) => F { Ok(Some((finished, opcode, payload))) => F {
finished, finished,