Skip to content

Rust 2018: Disable catch_expr, not targeted for 2018 edition - #53135

Merged
bors merged 1 commit into
rust-lang:masterfrom
joshtriplett:remove-catch-from-2018-preview
Aug 7, 2018
Merged

Rust 2018: Disable catch_expr, not targeted for 2018 edition#53135
bors merged 1 commit into
rust-lang:masterfrom
joshtriplett:remove-catch-from-2018-preview

Conversation

@joshtriplett

Copy link
Copy Markdown
Member

Fixes#52604

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @eddyb

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 6, 2018
@joshtriplett

Copy link
Copy Markdown
MemberAuthor

r? @scottmcm

@rust-highfiverust-highfive assigned scottmcm and unassigned eddybAug 6, 2018
@joshtriplett

Copy link
Copy Markdown
MemberAuthor

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-langrust-lang deleted a comment from borsAug 6, 2018
@rust-langrust-lang deleted a comment from borsAug 6, 2018

@scottmcmscottmcm left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
Member

@bors r+

@bors

bors commented Aug 6, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 1fd8e57 has been approved by Mark-Simulacrum

@borsbors 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
Copy Markdown
Member

@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
Fixesrust-lang#52604
@kennytmkennytm mentioned this pull request Aug 7, 2018
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:masterAug 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#31436rust-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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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

@joshtriplett@rust-highfive@Mark-Simulacrum@bors@kennytm@scottmcm@eddyb