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

Fix conversion from BytesVec to BytesMut and back (BytesVec::with_bytes_mut())

Browse source
This commit is contained in:
Nikolay Kim 2022-01-31 15:17:16 +06:00
parent 1baf305b1f
commit 767dd91b7e
6 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ntex-bytes/CHANGELOG.md
View file

@ -1,5 +1,9 @@
# Changes # Changes
## [0.1.11] (2022-01-31)
* Fix conversion from BytesVec to BytesMut and back (BytesVec::with_bytes_mut())
## [0.1.11] (2022-01-30) ## [0.1.11] (2022-01-30)
* Add BytesVec type * Add BytesVec type

2
ntex-bytes/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "ntex-bytes" name = "ntex-bytes"
version = "0.1.11" version = "0.1.12"
license = "MIT" license = "MIT"
authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Carl Lerche <me@carllerche.com>"] authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Carl Lerche <me@carllerche.com>"]
description = "Types and traits for working with bytes (bytes crate fork)" description = "Types and traits for working with bytes (bytes crate fork)"

8
ntex-bytes/src/bytes.rs
View file

@ -2730,7 +2730,9 @@ impl InnerVec {
) )
} else if kind == KIND_VEC { } else if kind == KIND_VEC {
let ptr = buf.inner.shared_vec(); let ptr = buf.inner.shared_vec();
let offset = buf.inner.arc.as_ptr() as usize - ptr as usize; let offset = buf.inner.ptr as usize - ptr as usize;
// we cannot use shared vec if BytesMut points to inside of vec
if buf.inner.cap < (*ptr).cap - offset { if buf.inner.cap < (*ptr).cap - offset {
InnerVec::from_slice( InnerVec::from_slice(
buf.inner.capacity(), buf.inner.capacity(),
@ -2738,11 +2740,11 @@ impl InnerVec {
buf.inner.pool(), buf.inner.pool(),
) )
} else { } else {
// BytesMut owns rest of the vec, so re-use
(*ptr).len = buf.len() as u32; (*ptr).len = buf.len() as u32;
(*ptr).offset = offset as u32; (*ptr).offset = offset as u32;
let inner = InnerVec(NonNull::new_unchecked(ptr)); let inner = InnerVec(NonNull::new_unchecked(ptr));
// reuse bytes mem::forget(buf); // reuse bytes
mem::forget(buf);
inner inner
} }
} else { } else {

1
ntex-bytes/tests/test_bytes.rs
View file

@ -824,6 +824,7 @@ fn bytes_vec_freeze() {
fn bytes_vec() { fn bytes_vec() {
let mut bytes = BytesVec::copy_from_slice(LONG); let mut bytes = BytesVec::copy_from_slice(LONG);
bytes.with_bytes_mut(|buf| { bytes.with_bytes_mut(|buf| {
assert_eq!(buf, LONG);
assert_eq!(buf.split_to(4), &LONG[..4]); assert_eq!(buf.split_to(4), &LONG[..4]);
}); });
assert_eq!(bytes, &LONG[4..]); assert_eq!(bytes, &LONG[4..]);

2
ntex-codec/Cargo.toml
View file

@ -16,4 +16,4 @@ name = "ntex_codec"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
ntex-bytes = "0.1.11" ntex-bytes = "0.1.12"

2
ntex/Cargo.toml
View file

@ -53,7 +53,7 @@ ntex-router = "0.5.1"
ntex-service = "0.3.1" ntex-service = "0.3.1"
ntex-macros = "0.1.3" ntex-macros = "0.1.3"
ntex-util = "0.1.13" ntex-util = "0.1.13"
ntex-bytes = "0.1.11" ntex-bytes = "0.1.12"
ntex-tls = "0.1.3" ntex-tls = "0.1.3"
ntex-rt = "0.4.3" ntex-rt = "0.4.3"
ntex-io = "0.1.7" ntex-io = "0.1.7"