Allow try-blocks in places where an open delim is expected
#70657
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
lcnr
changed the title
Centril
reviewed
Apr 2, 2020
src/librustc_lint/unused.rs
Outdated
| @@ -371,7 +371,7 @@ trait UnusedDelimLint { | |||
| fn is_expr_delims_necessary(inner: &ast::Expr, followed_by_block: bool) -> bool { | |||
| followed_by_block | |||
| && match inner.kind { | |||
| ast::ExprKind::Ret(_) | ast::ExprKind::Break(..) => true, | |||
| ExprKind::Ret(_) | ExprKind::Break(..) | ExprKind::TryBlock(_) => true, | |||
There was a problem hiding this comment.
This feels like a parser bug to me. We have:
fn is_try_block(&self) -> bool {
self.token.is_keyword(kw::Try) &&
self.look_ahead(1, |t| *t == token::OpenDelim(token::Brace)) &&
self.token.uninterpolated_span().rust_2018() &&
// Prevent `while try {} {}`, `if try {} {} else {}`, etc.
!self.restrictions.contains(Restrictions::NO_STRUCT_LITERAL)
}but we allow this for unsafe {}, async {}, etc.
joelpalmer
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
|
Waited for a comment by @petrochenkov on this, as this changes the purpose of this PR. I changed the parser to allow try in scrutinee position/in places where open braces are expected. // This now compiles
match try {} {
Ok(()) | Err(()) => (),
} |
lcnr
changed the title
try-blocks in places where an open delim is expected
|
Did you intend to include that submodule bump? |
|
I rarely do 😆 thank you for catching this |
lcnr
force-pushed
the
unused_delims_try
branch
2 times, most recently
from
4010c1d to
f74e466
Compare
|
📌 Commit f74e466771ad79410b84b2034d45cc3cc1d84855 has been approved by |
bors
added
S-waiting-on-bors
|
@bors r+ |
|
📌 Commit 81a3cd7 has been approved by |
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Apr 14, 2020
Allow `try`-blocks in places where an open delim is expected Closes rust-lang#70490 Closes rust-lang#56828 r? @Centril
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 15, 2020
Rollup of 8 pull requests Successful merges: - rust-lang#70657 (Allow `try`-blocks in places where an open delim is expected) - rust-lang#70947 (tighten CTFE safety net for accesses to globals) - rust-lang#70949 (simplify `vec!` macro) - rust-lang#71002 (fix target & runtool args order) - rust-lang#71082 (ptr: introduce len() method on raw slices) - rust-lang#71128 (Remove unused single_step flag) - rust-lang#71133 (Tighten time complexity on the doc of sort_by_key) - rust-lang#71135 (Update books) Failed merges: r? @ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #70490
Closes #56828
r? @Centril