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.

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

Merge 1.6.1 #721

Merged
merged 3 commits into from
Jul 13, 2024
Merged

Merge 1.6.1 #721

merged 3 commits into from
Jul 13, 2024

Conversation

Darksonn
Copy link
Contributor

@Darksonn Darksonn commented Jul 13, 2024

Merges #720 back into the master branch using a merge commit.

Must be merged from the command-line because we want an actual merge commit in the final history. We don't want to squash this change.

The history looks like this:

*   f8c7b57 - (3 minutes ago) Merge 'v1.6.1' into 'master' (#721) - Alice Ryhl (merge-1.6.1)
|\
| * fd13c7d - (9 minutes ago) chore: prepare bytes v1.6.1 (#720) - Alice Ryhl (v1.6.x)
| * 6b4b0ed - (9 hours ago) Fix `Bytes::is_unique` when created from shared `BytesMut` (#718) - Emily Crandall Fleischman
* | 9965a04 - (3 days ago) Remove unnecessary file (#719) - EXPLOSION (master)
* | 3443ca5 - (4 days ago) docs: clarify the behavior of `Buf::chunk` (#717) - vvvviiv
* | 8cc9407 - (2 weeks ago) Allow reclaiming the current allocation (#686) - Sebastian Hahn
* | 7a5154b - (3 weeks ago) Clarify how `BytesMut::zeroed` works and advantages to manual impl (#714) - Paolo Barbolini
* | fa1daac - (7 weeks ago) Change Bytes::make_mut to impl From<Bytes> for BytesMut (closes #709) (#710) - Anthony Ramine
* | caf520a - (8 weeks ago) Fix iter tests to use the actual bytes IntoIter instead of std (#707) - Paolo Barbolini
* | 4950c50 - (9 weeks ago) Offset from (#705) - Brad Dunbar
* | 86694b0 - (10 weeks ago) Add zero-copy make_mut (#695) - Émile Fugulin
* | 0c17e99 - (10 weeks ago) ci: silence unexpected-cfgs warnings due to `#[cfg(loom)]` (#703) - Alice Ryhl
* | cb7f844 - (3 months ago) Tweak clear and truncate length modifications (#700) - Alice Ryhl
* | a8806c2 - (3 months ago) Improve BytesMut::split suggestion (#699) - Paolo Barbolini
* | baa5053 - (3 months ago) Reuse capacity when possible in <BytesMut as Buf>::advance impl (#698) - Paolo Barbolini
* | ce09d7d - (3 months ago) Bytes::split_off - check fast path first (#693) - Brad Dunbar
* | 9d3ec1c - (3 months ago) Resize refactor (#696) - Brad Dunbar
* | 4e2c9c0 - (3 months ago) Truncate tweaks (#694) - Brad Dunbar
* | 327615e - (3 months ago) test(benches): encloses bytes into `test::black_box` for clone benches (#691) - Joseph Perez
* | b5fbfc3 - (3 months ago) perf: improve Bytes::copy_to_bytes (#688) - tison
* | 4eb62b9 - (3 months ago) Bytes::split_to - check fast path first (#689) - Brad Dunbar
* | e4af486 - (3 months ago) Don't set `len` in `BytesMut::reserve` (#682) - Brad Dunbar
* | 0d4cc7f - (3 months ago) Bytes: Use ManuallyDrop instead of mem::forget (#678) - Brad Dunbar
|/
* ce8d8a0 - (4 months ago) chore: prepare bytes v1.6.0 (#681) - Brad Dunbar (tag: v1.6.0)

zyxw59 and others added 2 commits July 13, 2024 01:09
The `is_unique` entry in the vtable for `Bytes` created from a shared
`BytesMut` just called the `shared_is_unique` function from the `bytes`
module. However, that function dereferences the `data` argument` as
`bytes::Shared`, but the actual underlying type is `bytes_mut::Shared`.
@Darksonn Darksonn requested a review from mox692 July 13, 2024 07:50
@Darksonn Darksonn merged commit f8c7b57 into master Jul 13, 2024
15 checks passed
@Darksonn Darksonn deleted the merge-1.6.1 branch July 13, 2024 10:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants