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

Fix potential BorrowMutError

Browse source
This commit is contained in:
Nikolay Kim 2022-01-12 22:09:49 +06:00
parent b49a5ed195
commit a2dd66815d
3 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ntex-tokio/CHANGES.md
View file

@ -1,5 +1,9 @@
# Changes # Changes
## [0.1.2] - 2022-01-12
* Fix potential BorrowMutError
## [0.1.1] - 2022-01-10 ## [0.1.1] - 2022-01-10
* Allow to set socket options * Allow to set socket options

6
ntex-tokio/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "ntex-tokio" name = "ntex-tokio"
version = "0.1.1" version = "0.1.2"
authors = ["ntex contributors <team@ntex.rs>"] authors = ["ntex contributors <team@ntex.rs>"]
description = "tokio intergration for ntex framework" description = "tokio intergration for ntex framework"
keywords = ["network", "framework", "async", "futures"] keywords = ["network", "framework", "async", "futures"]
@ -17,8 +17,8 @@ path = "src/lib.rs"
[dependencies] [dependencies]
ntex-bytes = "0.1.9" ntex-bytes = "0.1.9"
ntex-io = "0.1.2" ntex-io = "0.1.3"
ntex-util = "0.1.8" ntex-util = "0.1.9"
log = "0.4" log = "0.4"
pin-project-lite = "0.2" pin-project-lite = "0.2"
tokio = { version = "1", default-features = false, features = ["rt", "net", "sync", "signal"] } tokio = { version = "1", default-features = false, features = ["rt", "net", "sync", "signal"] }

14
ntex-tokio/src/io.rs
View file

@ -92,6 +92,7 @@ impl Future for ReadTask {
} }
Poll::Ready(Err(err)) => { Poll::Ready(Err(err)) => {
log::trace!("read task failed on io {:?}", err); log::trace!("read task failed on io {:?}", err);
drop(io);
let _ = this.state.release_read_buf(buf, new_bytes); let _ = this.state.release_read_buf(buf, new_bytes);
this.state.close(Some(err)); this.state.close(Some(err));
return Poll::Ready(()); return Poll::Ready(());
@ -99,6 +100,7 @@ impl Future for ReadTask {
} }
} }
drop(io);
if new_bytes == 0 && close { if new_bytes == 0 && close {
this.state.close(None); this.state.close(None);
return Poll::Ready(()); return Poll::Ready(());
@ -258,10 +260,11 @@ impl Future for WriteTask {
Shutdown::Stopping(ref mut count) => { Shutdown::Stopping(ref mut count) => {
// read until 0 or err // read until 0 or err
let mut buf = [0u8; 512]; let mut buf = [0u8; 512];
let mut io = this.io.borrow_mut();
loop { loop {
let mut read_buf = ReadBuf::new(&mut buf); let mut read_buf = ReadBuf::new(&mut buf);
match Pin::new(&mut *io).poll_read(cx, &mut read_buf) { match Pin::new(&mut *this.io.borrow_mut())
.poll_read(cx, &mut read_buf)
{
Poll::Ready(Err(_)) | Poll::Ready(Ok(_)) Poll::Ready(Err(_)) | Poll::Ready(Ok(_))
if read_buf.filled().is_empty() => if read_buf.filled().is_empty() =>
{ {
@ -536,6 +539,7 @@ mod unixstream {
} }
Poll::Ready(Err(err)) => { Poll::Ready(Err(err)) => {
log::trace!("read task failed on io {:?}", err); log::trace!("read task failed on io {:?}", err);
drop(io);
let _ = this.state.release_read_buf(buf, new_bytes); let _ = this.state.release_read_buf(buf, new_bytes);
this.state.close(Some(err)); this.state.close(Some(err));
return Poll::Ready(()); return Poll::Ready(());
@ -543,6 +547,7 @@ mod unixstream {
} }
} }
drop(io);
if new_bytes == 0 && close { if new_bytes == 0 && close {
this.state.close(None); this.state.close(None);
return Poll::Ready(()); return Poll::Ready(());
@ -682,10 +687,11 @@ mod unixstream {
Shutdown::Stopping(ref mut count) => { Shutdown::Stopping(ref mut count) => {
// read until 0 or err // read until 0 or err
let mut buf = [0u8; 512]; let mut buf = [0u8; 512];
let mut io = this.io.borrow_mut();
loop { loop {
let mut read_buf = ReadBuf::new(&mut buf); let mut read_buf = ReadBuf::new(&mut buf);
match Pin::new(&mut *io).poll_read(cx, &mut read_buf) { match Pin::new(&mut *this.io.borrow_mut())
.poll_read(cx, &mut read_buf)
{
Poll::Ready(Err(_)) | Poll::Ready(Ok(_)) Poll::Ready(Err(_)) | Poll::Ready(Ok(_))
if read_buf.filled().is_empty() => if read_buf.filled().is_empty() =>
{ {