Skip to content

fix Box::into_unique#78446

Merged
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:box
Oct 29, 2020
Merged

fix Box::into_unique#78446
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:box

Conversation

@RalfJung

@RalfJung RalfJung commented Oct 27, 2020 •
edited
Loading

Copy link
Copy Markdown
Member

#77187 broke Stacked Borrows pointer tagging around Box::into_unique (this is caused by Box being a special case in the type system, which box-internal code needs to account for). This PR fixes that.

r? @Amanieu Cc @TimDiekmann

Fixes #78419.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 27, 2020
@TimDiekmann

TimDiekmann commented Oct 27, 2020

Copy link
Copy Markdown
Member

Thanks for fixing this! :)

@RalfJung RalfJung mentioned this pull request Oct 28, 2020
Merged
@Amanieu

Amanieu commented Oct 29, 2020

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Oct 29, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit ab374dc has been approved by Amanieu

@bors bors 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 Oct 29, 2020
@RalfJung

RalfJung commented Oct 29, 2020

Copy link
Copy Markdown
Member Author

@bors p=1
(needed to fix a tool)

@bors

bors commented Oct 29, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ab374dc with merge 167f68bf6cc4934c4a5085e829ae26a63410581b...

@bors

bors commented Oct 29, 2020

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 29, 2020
@RalfJung

RalfJung commented Oct 29, 2020

Copy link
Copy Markdown
Member Author

error: failed to download from https://crates.io/api/v1/crates/autocfg/1.0.1/download

@bors retry

@bors bors 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 Oct 29, 2020
@RalfJung

RalfJung commented Oct 29, 2020

Copy link
Copy Markdown
Member Author

@pietroalbini is there an issue tracking these crates.io download failures? They seem to happen more often than one would hope.

@emilyalbini

emilyalbini commented Oct 29, 2020

Copy link
Copy Markdown
Member

@RalfJung that was https://status.crates.io/incidents/yms1rdmr8h1z.

@bors

bors commented Oct 29, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ab374dc with merge a53fb30...

@bors

bors commented Oct 29, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: Amanieu
Pushing a53fb30 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 29, 2020
@bors bors merged commit a53fb30 into rust-lang:master Oct 29, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 29, 2020
@RalfJung RalfJung deleted the box branch October 30, 2020 09:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Amanieu Amanieu

Labels

merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.49.0

Development

Successfully merging this pull request may close these issues.

miri no longer builds after rust-lang/rust#77187

7 participants

@RalfJung @TimDiekmann @Amanieu @bors @emilyalbini @rust-highfive @rustbot