Skip to content

Rollup of 2 pull requests #72316

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

Merged
merged 5 commits into from
May 18, 2020
Merged

Rollup of 2 pull requests #72316

merged 5 commits into from
May 18, 2020

Conversation

RalfJung
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

steveklabnik and others added 5 commits May 17, 2020 10:35
https://djugei.github.io/bad-at-unsafe/ describes an error a user had when trying to use offset:

> At first I just assumed that the .add() and .offset() methods on pointers would mutate the pointer. They do not. Instead they return a new pointer, which gets dropped silently if you don't use it. Unlike for example Result, which is must_use annotated.
HermitCore introduce a new interface to intialize conditional variables.
Consequently, minor changes are required to support this interface.
…sfackler

make offset must_use

https://djugei.github.io/bad-at-unsafe/ describes an error a user had when trying to use offset:

> At first I just assumed that the .add() and .offset() methods on pointers would mutate the pointer. They do not. Instead they return a new pointer, which gets dropped silently if you don't use it. Unlike for example Result, which is must_use annotated.

This PR only adds `offset`, because I wanted to float the idea; I'm imagining that there's more than just `add` and `offset` that could use this. I am also very open to re-wording the warning.

r? @rust-lang/libs
use the new interface to initialize conditional variables

HermitCore introduce a new interface to intialize conditional variables.
Consequently, minor changes are required to support this interface.
@RalfJung
Copy link
Member Author

@rustbot modify labels: +rollup
@bors r+ rollup=never p=2

@bors
Copy link
Collaborator

bors commented May 18, 2020

📌 Commit 2cff5d9 has been approved by RalfJung

@rustbot rustbot added the rollup A PR which is a rollup label May 18, 2020
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 18, 2020
@bors
Copy link
Collaborator

bors commented May 18, 2020

⌛ Testing commit 2cff5d9 with merge d0fe6e4e317dde7e1e4d3a7eea7025456af9befd...

@bors
Copy link
Collaborator

bors commented May 18, 2020

💔 Test failed - checks-azure

@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 May 18, 2020
@RalfJung
Copy link
Member Author

Network failure on macOS (Cc @rust-lang/infra)
@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 May 18, 2020
@bors
Copy link
Collaborator

bors commented May 18, 2020

⌛ Testing commit 2cff5d9 with merge d4bf056...

@bors
Copy link
Collaborator

bors commented May 18, 2020

☀️ Test successful - checks-azure
Approved by: RalfJung
Pushing d4bf056 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 18, 2020
@bors bors merged commit d4bf056 into rust-lang:master May 18, 2020
@RalfJung RalfJung deleted the rollup-70g6bln branch May 21, 2020 08:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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.

5 participants