Skip to content

Conversation

Amanieu
Copy link
Member

@Amanieu Amanieu commented Apr 27, 2018

Fixes #49632

@pietroalbini pietroalbini added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 27, 2018
@pietroalbini
Copy link
Member

Highfive failed to assign a reviewer, @estebank?

@estebank
Copy link
Contributor

It looks good to me, but deferring to @alexcrichton for final approval. The code looks correct but want a second pair of eyes to make sure there isn't some subtlety I'm not privy to.

r? @alexcrichton

@rust-highfive

This comment has been minimized.

@estebank

This comment has been minimized.

@bors

This comment has been minimized.

@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 Apr 27, 2018
@estebank
Copy link
Contributor

@bors r-
@Amanieu you need to fix some tests https://travis-ci.org/rust-lang/rust/jobs/371877369#L1840

[00:41:45]     [ui] ui/error-codes/E0518.rs
[00:41:45]     [ui] ui/feature-gate/issue-43106-gating-of-inline.rs

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 27, 2018
@kennytm kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 27, 2018
@rust-highfive

This comment has been minimized.

@Amanieu
Copy link
Member Author

Amanieu commented Apr 27, 2018

Fixed.

@alexcrichton
Copy link
Member

@bors: r+

Thanks @Amanieu!

To confirm, does this need a beta backport as well?

@bors
Copy link
Collaborator

bors commented Apr 27, 2018

📌 Commit 5f2c111 has been approved by alexcrichton

@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 Apr 27, 2018
@Amanieu
Copy link
Member Author

Amanieu commented Apr 27, 2018

@alexcrichton That shouldn't be necessary since attributes on expressions (stmt_expr_attributes) are still unstable.

@alexcrichton
Copy link
Member

Ok great, thanks!

kennytm added a commit to kennytm/rust that referenced this pull request Apr 27, 2018
bors added a commit that referenced this pull request Apr 27, 2018
Rollup of 9 pull requests

Successful merges:

 - #49858 (std: Mark `ptr::Unique` with `#[doc(hidden)]`)
 - #49968 (Stabilize dyn trait)
 - #50192 (Add some utilities to `libsyntax`)
 - #50251 (rustc: Disable threads in LLD for wasm)
 - #50263 (rustc: Emit `uwtable` for allocator shims)
 - #50269 (Update `parking_lot` dependencies)
 - #50273 (Allow #[inline] on closures)
 - #50284 (fix search load page failure)
 - #50257 (Don't ICE on tuple struct ctor with incorrect arg count)

Failed merges:
@bors bors merged commit 5f2c111 into rust-lang:master Apr 27, 2018
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.

7 participants