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

Use raw version of align_of in rc data_offset #80398

Merged
merged 1 commit into from
Dec 29, 2020
Merged

Conversation

CAD97
Copy link
Contributor

@CAD97 CAD97 commented Dec 26, 2020

This was missed in #73845 when switching to use the raw operators.
Fixes #80365

@rust-highfive
Copy link
Collaborator

r? @cramertj

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 26, 2020
@CAD97
Copy link
Contributor Author

CAD97 commented Dec 26, 2020

cc @vorner @RalfJung (from #80365)

library/alloc/src/sync.rs Outdated Show resolved Hide resolved
This was missed in rust-lang#73845 when switching to use the raw operators.
Fixes rust-lang#80365
@dtolnay
Copy link
Member

dtolnay commented Dec 26, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 26, 2020

📌 Commit eeed311 has been approved by dtolnay

@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 Dec 26, 2020
@dtolnay dtolnay assigned dtolnay and unassigned cramertj Dec 26, 2020
@CAD97 CAD97 closed this Dec 28, 2020
@CAD97 CAD97 deleted the fix-80365 branch December 28, 2020 00:13
@CAD97
Copy link
Contributor Author

CAD97 commented Dec 28, 2020

Sorry I messed this branch up one moment

@CAD97
Copy link
Contributor Author

CAD97 commented Dec 28, 2020

@rustbot modify labels to -S-waiting-on-bors, +S-waiting-on-review

cc @dtolnay: I accidentally force pushed the wrong branch, so I think that will have revoked the r+.
This is the last time I name branches with an issue number in them...

@rustbot rustbot 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 Dec 28, 2020
@RalfJung
Copy link
Member

@bors r=dtolnay

@bors
Copy link
Contributor

bors commented Dec 28, 2020

📌 Commit eeed311 has been approved by dtolnay

@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 Dec 28, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 29, 2020
Rollup of 11 pull requests

Successful merges:

 - rust-lang#80383 (clarify wrapping ptr arithmetic docs)
 - rust-lang#80390 (BTreeMap: rename the area access methods)
 - rust-lang#80393 (Add links to the source for the rustc and rustdoc books.)
 - rust-lang#80398 (Use raw version of align_of in rc data_offset)
 - rust-lang#80402 (Document `InferTy` & co.)
 - rust-lang#80403 (fix: small typo error in chalk/mod.rs)
 - rust-lang#80410 (rustdoc book: fix example)
 - rust-lang#80419 (Add regression test for rust-lang#80375)
 - rust-lang#80430 (Add "length" as doc alias to len methods)
 - rust-lang#80431 (Add "chr" as doc alias to char::from_u32)
 - rust-lang#80448 (Fix stabilization version of deque_range feature.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7003537 into rust-lang:master Dec 29, 2020
@rustbot rustbot added this to the 1.51.0 milestone Dec 29, 2020
@CAD97 CAD97 deleted the fix-80365 branch December 29, 2020 07:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

UB inside Weak::as_ptr
7 participants