Implement try block expressions #52602

scottmcm · 2018-07-22T01:50:02Z

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

~~Fixes #52604~~ That was fixed by PR #53135
cc #31436 #50412

rust-highfive · 2018-07-22T01:50:13Z

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

scottmcm · 2018-07-22T06:39:58Z

Ok, I think this is in good enough for a review pass. I've never touched most of these parts of the compiler before, so I suspect there are opportunities for improvement in how I did things 🙃

petrochenkov · 2018-07-22T11:06:17Z

src/libsyntax_pos/symbol.rs

@@ -413,23 +413,30 @@ declare_keywords! {
    (49, Virtual,            "virtual")
    (50, Yield,              "yield")

+    // Edition-specific keywords currently in use.
+    (51, Try,                "try") // >= 2018 Edition Only


Nit: Keywords are not normally moved into the "used" category until the feature is stable (e.g. macro/yield/async are all "reserved for future use").

Centril · 2018-07-24T00:34:22Z

src/doc/unstable-book/src/language-features/catch-expr.md

@@ -6,22 +6,24 @@ The tracking issue for this feature is: [#31436]

 ------------------------

-The `catch_expr` feature adds support for a `catch` expression. The `catch`
-expression creates a new scope one can use the `?` operator in.
+The `catch_expr` feature adds support for `try` blocks. A `try`


Should probably rename this to try_expr?

michaelwoerister · 2018-07-24T12:34:31Z

r? @nikomatsakis for re-assignment. I don't think I'm the right person to review this.

nikomatsakis

Very nice!

nikomatsakis · 2018-07-24T20:28:18Z

@bors r+

bors · 2018-07-24T20:28:19Z

📌 Commit ec85915c5ccf9ec1ba2b4183add0fe7efbbaa00c has been approved by nikomatsakis

nikomatsakis · 2018-07-24T20:45:44Z

@bors r-

nikomatsakis · 2018-07-24T20:45:59Z

One question: do we want to provide a kind of smoother path for people using do catch today? e.g., a nice error message?

nikomatsakis · 2018-07-24T20:46:06Z

Or do we just not care :)

Centril · 2018-07-24T20:49:33Z

@nikomatsakis Here's a sourcegraph query for it, https://sourcegraph.com/search?q=repogroup:crates+case:yes++%5Cbdo%5Cs%2Bcatch%5Cb+max:400

Most of these occurrences are irrelevant and so I think we should not care.

Centril · 2018-07-24T20:50:59Z

Also; having the feature called catch_expr for a try { .. } block will be confusing, so let's change that bit :)

kennytm · 2018-08-23T03:09:00Z

@bors retry

An error occurred while generating the build script.

bors · 2018-08-23T04:58:53Z

⌛ Testing commit 0095471 with merge 127d02057977122d7ca0707c27d3ce2a4cbd66db...

bors · 2018-08-23T06:34:07Z

💔 Test failed - status-travis

rust-highfive · 2018-08-23T06:34:09Z

The job x86_64-gnu-aux of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[01:31:26] 
[01:31:26] testing https://github.com/servo/servo
[01:31:26] Initialized empty Git repository in /checkout/obj/build/ct/servo/.git/
[01:31:26] fatal: Could not parse object '17e97b9320fdb7cdb33bbc5f4d0fde0653bbf2e4'.
[01:31:46] fatal: unable to access 'https://github.com/servo/servo/': Could not resolve host: github.com
[01:31:46] thread 'main' panicked at 'assertion failed: status.success()', tools/cargotest/main.rs:128:13
[01:31:46] 
[01:31:46] 
[01:31:46] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/cargotest" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "/checkout/obj/build/ct"
[01:31:46] expected success, got: exit code: 101
[01:31:46] expected success, got: exit code: 101
[01:31:46] 
[01:31:46] 
[01:31:46] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/test/pretty src/test/run-pass/pretty src/test/run-fail/pretty src/test/run-pass-valgrind/pretty src/test/run-pass-fulldeps/pretty src/test/run-fail-fulldeps/pretty src/tools/cargo src/tools/cargotest
[01:31:46] Build completed unsuccessfully in 0:35:04
[01:31:46] make: *** [check-aux] Error 1
[01:31:46] Makefile:60: recipe for target 'check-aux' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:1aac925a
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:156fb9f1:start=1535005949727505251,finish=1535005949733912231,duration=6406980
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0255de5b
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:00dd4bfc
travis_time:start:00dd4bfc
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0252de30
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

scottmcm · 2018-08-23T06:36:01Z

I'm cursed today:

[01:31:46] fatal: unable to access 'https://github.com/servo/servo/': Could not resolve host: github.com

https://api.travis-ci.org/v3/job/419489535/log.txt

varkor · 2018-08-23T10:58:52Z

@bors retry

bors · 2018-08-23T11:46:32Z

⌛ Testing commit 0095471 with merge 35bf1ae...

Implement try block expressions I noticed that `try` wasn't a keyword yet in Rust 2018, so... ~~Fixes #52604 That was fixed by PR #53135 cc #31436 #50412

bors · 2018-08-23T13:53:46Z

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 35bf1ae to master...

fix clippy breakage due to rust-lang/rust#52602

alexcrichton · 2018-08-24T21:37:57Z

As a heads up, we've got a pretty serious issue which may be a bit of a roadblock for this. Currently the compiler doesn't actually warn about usages of the try identifier on the 2015 edition, but that's tracked by #53077 and fix for it is at #53685. Unfortunately though the primary use of the try keyword, the try! macro in the standard library, suffers from #53686.

For the edition we'll need to have at least some warning for users of the try! macro to rustfix into r#try or suggest ?, but currently no warnings are emitted which can make for a difficult edition transition experience. Some eyes and/or thoughts on #53686 would be greatly appreciated!

`async` was added in rust-lang/rust#50307 and is not yet implemented `try` was added in rust-lang/rust#52602 and is not yet stable: rust-lang/rust#31436

rust-highfive assigned michaelwoerister Jul 22, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 22, 2018

scottmcm mentioned this pull request Jul 22, 2018

do catch is accidentally stable in 2018 edition #52604

Closed

scottmcm force-pushed the tryblock-expr branch 2 times, most recently from 6fe5f79 to 26c185a Compare July 22, 2018 04:41

This comment has been minimized.

Sign in to view

scottmcm mentioned this pull request Jul 22, 2018

Empty log analysis for PR 52602 rust-lang/rust-log-analyzer#22

Open

scottmcm changed the title ~~WIP: Implement try block expressions~~ Implement try block expressions Jul 22, 2018

petrochenkov reviewed Jul 22, 2018

View reviewed changes

This comment has been minimized.

Sign in to view

scottmcm force-pushed the tryblock-expr branch from 86455a5 to ec85915 Compare July 23, 2018 04:54

Centril reviewed Jul 24, 2018

View reviewed changes

rust-highfive assigned nikomatsakis and unassigned michaelwoerister Jul 24, 2018

nikomatsakis approved these changes Jul 24, 2018

View reviewed changes

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 Jul 24, 2018

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 Jul 24, 2018

scottmcm mentioned this pull request Jul 25, 2018

Implement edition-gated keywords #49610

Closed

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 Aug 23, 2018

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 23, 2018

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 Aug 23, 2018

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 23, 2018

bors added a commit that referenced this pull request Aug 23, 2018

Auto merge of #52602 - scottmcm:tryblock-expr, r=nikomatsakis

35bf1ae

Implement try block expressions I noticed that `try` wasn't a keyword yet in Rust 2018, so... ~~Fixes #52604 That was fixed by PR #53135 cc #31436 #50412

bors mentioned this pull request Aug 23, 2018

Use optimized SmallVec implementation #53384

Merged

bors merged commit 0095471 into rust-lang:master Aug 23, 2018

scottmcm deleted the tryblock-expr branch August 23, 2018 18:37

matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Aug 23, 2018

fix clippy breakage due to rust-lang/rust#52602

c98987f

matthiaskrgr mentioned this pull request Aug 23, 2018

Update clippy #53638

Merged

scottmcm mentioned this pull request Aug 23, 2018

support do catch intellij-rust/intellij-rust#2400

Closed

flip1995 added a commit to rust-lang/rust-clippy that referenced this pull request Aug 23, 2018

Merge pull request #3077 from matthiaskrgr/rustup_2

dda6566

fix clippy breakage due to rust-lang/rust#52602

Mark-Simulacrum mentioned this pull request Aug 25, 2018

Macro invocations bypass new keyword identifier checks #53686

Closed

topecongiro mentioned this pull request Aug 26, 2018

Build with rust nightly. ExprKind::Catch is now ExprKind::TryBlock. rust-lang/rustfmt#2964

Closed

scottmcm mentioned this pull request Feb 12, 2019

Experimentally add ffi_const and ffi_pure extern fn attributes #58327

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement try block expressions #52602

Implement try block expressions #52602

scottmcm commented Jul 22, 2018 •

edited

Loading

rust-highfive commented Jul 22, 2018

This comment has been minimized.

scottmcm commented Jul 22, 2018 •

edited

Loading

petrochenkov Jul 22, 2018

This comment has been minimized.

Centril Jul 24, 2018

michaelwoerister commented Jul 24, 2018

nikomatsakis left a comment

nikomatsakis commented Jul 24, 2018

bors commented Jul 24, 2018

nikomatsakis commented Jul 24, 2018

nikomatsakis commented Jul 24, 2018

nikomatsakis commented Jul 24, 2018

Centril commented Jul 24, 2018

Centril commented Jul 24, 2018

kennytm commented Aug 23, 2018

bors commented Aug 23, 2018

bors commented Aug 23, 2018

rust-highfive commented Aug 23, 2018

scottmcm commented Aug 23, 2018

varkor commented Aug 23, 2018

bors commented Aug 23, 2018

bors commented Aug 23, 2018

alexcrichton commented Aug 24, 2018

Implement try block expressions #52602

Implement try block expressions #52602

Conversation

scottmcm commented Jul 22, 2018 • edited Loading

rust-highfive commented Jul 22, 2018

This comment has been minimized.

scottmcm commented Jul 22, 2018 • edited Loading

petrochenkov Jul 22, 2018

Choose a reason for hiding this comment

This comment has been minimized.

Centril Jul 24, 2018

Choose a reason for hiding this comment

michaelwoerister commented Jul 24, 2018

nikomatsakis left a comment

Choose a reason for hiding this comment

nikomatsakis commented Jul 24, 2018

bors commented Jul 24, 2018

nikomatsakis commented Jul 24, 2018

nikomatsakis commented Jul 24, 2018

nikomatsakis commented Jul 24, 2018

Centril commented Jul 24, 2018

Centril commented Jul 24, 2018

kennytm commented Aug 23, 2018

bors commented Aug 23, 2018

bors commented Aug 23, 2018

rust-highfive commented Aug 23, 2018

scottmcm commented Aug 23, 2018

varkor commented Aug 23, 2018

bors commented Aug 23, 2018

bors commented Aug 23, 2018

alexcrichton commented Aug 24, 2018

scottmcm commented Jul 22, 2018 •

edited

Loading

scottmcm commented Jul 22, 2018 •

edited

Loading