Skip to content

[beta] backports - #120352

Merged
bors merged 3 commits into
rust-lang:betafrom
cuviper:beta-next
Jan 27, 2024
Merged

[beta] backports#120352
bors merged 3 commits into
rust-lang:betafrom
cuviper:beta-next

Conversation

@cuviper

@cuvipercuviper commented Jan 25, 2024

Copy link
Copy Markdown
Member

r? ghost

@the8472@cuviper
update internal ASCII art comment for vec specializations
dde3897
(cherry picked from commit b28a953)
@the8472@cuviper
remove alignment-changing in-place collect
e55be1a
Currently stable users can't benefit from this because GlobaAlloc doesn't support
alignment-changing realloc and neither do most posix allocators.
So in practice it always results in an extra memcpy.
(cherry picked from commit 85d1787)
@the8472@cuviper
fix: Drop guard was deallocating with the incorrect size
73b36b1
InPlaceDstBufDrop holds onto the allocation before the shrinking happens
which means it must deallocate the destination elements but the source
allocation.
(cherry picked from commit 5796b3c)
@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jan 25, 2024
@cuviper

cuviper commented Jan 25, 2024

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never

@bors

bors commented Jan 25, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 73b36b1 has been approved by cuviper

It is now in the queue for this repository.

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 25, 2024
@NadrierilNadrieril mentioned this pull request Jan 27, 2024
Closed
@bors

bors commented Jan 27, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 73b36b1 with merge 1633e2a...

@bors

bors commented Jan 27, 2024

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 1633e2a to beta...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jan 27, 2024
@bors
bors merged commit 1633e2a into rust-lang:betaJan 27, 2024
@rustbotrustbot added this to the 1.76.0 milestone Jan 27, 2024
@cuviper
cuviper deleted the beta-next branch February 14, 2024 04:50
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.76.0

Development

Successfully merging this pull request may close these issues.

4 participants

@cuviper@bors@rustbot@the8472