Skip to content

Conversation

joshtriplett
Copy link
Member

Fixes #52604

@rust-highfive
Copy link
Contributor

r? @eddyb

(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 Aug 6, 2018
@joshtriplett
Copy link
Member Author

r? @scottmcm

@rust-highfive rust-highfive assigned scottmcm and unassigned eddyb Aug 6, 2018
@joshtriplett
Copy link
Member Author

Note that #52602 fixes this as well, as part of a full implementation of try; this separates out just the fix for the features in the edition.

@rust-lang rust-lang deleted a comment from bors Aug 6, 2018
@rust-lang rust-lang deleted a comment from bors Aug 6, 2018
Copy link
Member

@scottmcm scottmcm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks right to me, but I don't have reviewer privileges.

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 6, 2018

📌 Commit 1fd8e57 has been approved by Mark-Simulacrum

@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 Aug 6, 2018
@kennytm
Copy link
Member

kennytm commented Aug 7, 2018

@bors rollup

kennytm added a commit to kennytm/rust that referenced this pull request Aug 7, 2018
…-preview, r=Mark-Simulacrum

Rust 2018: Disable catch_expr, not targeted for 2018 edition

Fixes rust-lang#52604
bors added a commit that referenced this pull request Aug 7, 2018
Rollup of 10 pull requests

Successful merges:

 - #52885 (Remove some unused method arguments from typeck)
 - #52886 (cleanup: Remove `Def::GlobalAsm`)
 - #53028 (Building librustc_codegen_llvm in a separate directory)
 - #53052 (fixed broken links to char)
 - #53060 (Change rustdoc style so fully qualified name does not overlap src link)
 - #53068 (Rename Executor trait to Spawn)
 - #53093 (Enable macros to pass $:literal to another macro)
 - #53107 (Remove references to `StaticMutex` which got removed a while ago)
 - #53135 (Rust 2018: Disable catch_expr, not targeted for 2018 edition)
 - #53139 (set emit_debug_gdb_scripts: false for riscv32imac-unknown-none target)
@bors bors merged commit 1fd8e57 into rust-lang:master Aug 7, 2018
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Aug 22, 2018
Implement try block expressions

I noticed that `try` wasn't a keyword yet in Rust 2018, so...

~~Fix​es rust-lang#52604 That was fixed by PR rust-lang#53135
cc rust-lang#31436 rust-lang#50412
bors added a commit that referenced this pull request Aug 23, 2018
Implement try block expressions

I noticed that `try` wasn't a keyword yet in Rust 2018, so...

~~Fix​es #52604 That was fixed by PR #53135
cc #31436 #50412
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