Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add conversion from Bytes to Vec<u8> #547

Merged
merged 27 commits into from Jul 13, 2022
Merged

Add conversion from Bytes to Vec<u8> #547

merged 27 commits into from Jul 13, 2022

Conversation

NobodyXu
Copy link
Contributor

@NobodyXu NobodyXu commented May 1, 2022 •
edited

Fixed #427

This PR adds conversion for Bytes, which is parallel to #543, which adds conversion for BytesMut.

This PR supersedes #151

Signed-off-by: Jiahao XU Jiahao_XU@outlook.com

@NobodyXu NobodyXu force-pushed the feature/into-vec-for-bytes branch from 6a81b68 to 37b4146 Compare July 6, 2022 03:07
@NobodyXu
Copy link
Contributor Author

NobodyXu commented Jul 6, 2022

CI/miri failed due to strict provenance being enabled and the bytes codebase uses integer-pointer conversions and vice versa.

I also run miri locally with strict provenance and it succeeded with warning on integer-pointer cast.

This PR itself does not add any integer-pointer conversion, so it should not block this PR from being merged.

@NobodyXu
Impl From<Bytes> for Vec<u8>
90e00ee 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix into-vec impl for odd/even/shared vtable in bytes.rs
418f280 
Add new function `dealloc_shared` and call it instead of setting the
underlying `Vec` contained in `Shared` to an empty Vec then
`release_shared`.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix invalid exclusive reborrowing in bytes.rs
fcd5dc6 
Instead of reborrowing it as mutable reference, modify the first borrow
to be mutable reference.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Impl test_bytes_into_vec in test_bytes_vec_alloc.rs
87d7275 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Impl test_bytes_into_vec in test_bytes_odd_alloc.rs
afc8674 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix leaking in into_vec impl
8437da0 
Call `release_shared` if `kind == KIND_ARC` and the shared is not
unique.

Also fixed reborrowing as mutable reference issue in
`bytes_mut::shared_to_vec`.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Impl test_bytes_into_vec & test_bytes_into_vec_promotable_even
977b5ff 
in `test_bytes.rs`

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Add tests for cases where offset != 0 for vtable in bytes.rs
01aaf19 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Add test for Bytes created from BytesMut where offset != 0
b43705f 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Refactor: Extract fn shared_to_vec_impl
6ab1c25 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix shared_to_vec_impl: Add Acquire fence
697b299 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Refactor: Inline dealloc_shared that is used only once
4c74191 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix shared_to_vec_impl: Take *mut Shared
b322d2d 
instead of `&mut Shared` to avoid breaking stack borrow rules.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Add convenient script run_tests.sh
015496b 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix code style in shared_to_vec_impl
40f481b 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Refactor shared_to_vec: Avoid unnecessary deref
819968c 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Refactor: Extract fn promoteable_to_vec_impl
b1e7414 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix promoteable_to_vec_impl: Copy back buffer
730eaaf 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Refactor: Extract promoteable_to_vec
bf4ac42 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Refactor: Inline promotable_to_vec_impl
b5e67e3 
As it is only used by `promotable_to_vec`

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
Darksonn
Darksonn reviewed Jul 10, 2022
View reviewed changes
run_tests.sh Outdated Show resolved Hide resolved
@NobodyXu
Rm run_tests.sh
21fe23a 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
Darksonn
Darksonn reviewed Jul 11, 2022
View reviewed changes
src/bytes.rs Outdated Show resolved Hide resolved
src/bytes.rs Outdated Show resolved Hide resolved
NobodyXu and others added 3 commits July 12, 2022 00:19
@NobodyXu @Darksonn
Use slice::to_vec explicitly in static_to_vec
ff47582 
Co-authored-by: Alice Ryhl <aliceryhl@google.com>
@NobodyXu @Darksonn
Explicitly drop the shared
9cdd8c5 
Co-authored-by: Alice Ryhl <aliceryhl@google.com>
@NobodyXu
Use slice::to_vec in shared_to_vec_impl
f092e6d 
just to be explicit

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Use slice::to_vec in shared_v_to_vec
7eb6ca8 
Just to be explicit

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
Darksonn
Darksonn reviewed Jul 12, 2022
View reviewed changes
src/bytes.rs Outdated Show resolved Hide resolved
src/bytes_mut.rs Outdated Show resolved Hide resolved
@NobodyXu
Fix bytes_mut::shared_v_to_vec: Avoid mut ref
5ed21db 
until `is_unique()` returns `true`.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix shared_to_vec_impl: Use compare_exchange
0cd3f9e 
To set the `ref_cnt` to `0` using `Ordering::AcqRel` if it is unique.
Otherwise, it is equivalent to a `Ordering::Relaxed` load.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu NobodyXu requested a review from Darksonn July 13, 2022 03:14
Darksonn
Darksonn approved these changes Jul 13, 2022
View reviewed changes
Copy link
Contributor

@Darksonn Darksonn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Darksonn Darksonn merged commit cd188cb into tokio-rs:master Jul 13, 2022
@NobodyXu NobodyXu deleted the feature/into-vec-for-bytes branch July 13, 2022 07:04
@Darksonn Darksonn mentioned this pull request Jul 19, 2022
Merged
lelongg pushed a commit to lelongg/bytes that referenced this pull request Jan 9, 2023
@NobodyXu @Darksonn @lelongg
Add conversion from Bytes to Vec<u8> (tokio-rs#547)
ea44b1c 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
Co-authored-by: Alice Ryhl <aliceryhl@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Darksonn Darksonn Darksonn approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Conversion from Bytes to Vec<u8>?
2 participants
@NobodyXu @Darksonn