Make inline const work in range patterns #78116

spastorino · 2020-10-19T19:21:05Z

Fixes #78108 which is a follow up of #77124

r? @petrochenkov

src/test/ui/inline-const/const-match-pat-range.rs

petrochenkov · 2020-10-19T19:37:36Z

r=me with additional test cases.

spastorino · 2020-10-19T21:46:07Z

@petrochenkov check it out again because the half open ranges solutions seems a bit hacky to me.

compiler/rustc_ast/src/token.rs

compiler/rustc_parse/src/parser/pat.rs

src/test/ui/inline-const/const-match-pat-range.rs

compiler/rustc_parse/src/parser/pat.rs

src/test/ui/inline-const/const-match-pat-range.rs

camelid

It might be a good idea to add some UI check-fail tests for cases like:

match x {
    1 .. const 2 => {}
}

spastorino · 2020-10-20T23:05:42Z

match x {
    1 .. const 2 => {}
}

It's interesting how this case fails ...

error[E0586]: inclusive range with no end
 --> src/test/ui/inline-const/const-match-pat-fail.rs:5:11
  |
5 |         1 ..= const 2 => {}
  |           ^^^ help: use `..` instead
  |
  = note: inclusive ranges must be bounded at the end (`..=b` or `a..=b`)

error: expected one of `=>`, `if`, or `|`, found keyword `const`
 --> src/test/ui/inline-const/const-match-pat-fail.rs:5:15
  |
5 |         1 ..= const 2 => {}
  |               ^^^^^ expected one of `=>`, `if`, or `|`

error[E0658]: half-open range patterns are unstable
 --> src/test/ui/inline-const/const-match-pat-fail.rs:5:9
  |
5 |         1 ..= const 2 => {}
  |         ^^^^^
  |
  = note: see issue #67264 <https://github.com/rust-lang/rust/issues/67264> for more information
  = help: add `#![feature(half_open_range_patterns)]` to the crate attributes to enable

In the parser we are looking for const { not just const so it asummes that it's a half-open range with no end. Unsure what would be ok to do with this case but the error doesn't sound great.
Anyway it's the same that happens if instead of const you use something else like let.

error[E0586]: inclusive range with no end
 --> src/test/ui/inline-const/const-match-pat-fail.rs:5:11
  |
5 |         1 ..= let 2 => {}
  |           ^^^ help: use `..` instead
  |
  = note: inclusive ranges must be bounded at the end (`..=b` or `a..=b`)

error: expected one of `=>`, `if`, or `|`, found keyword `let`
 --> src/test/ui/inline-const/const-match-pat-fail.rs:5:15
  |
5 |         1 ..= let 2 => {}
  |               ^^^ expected one of `=>`, `if`, or `|`

error[E0658]: half-open range patterns are unstable
 --> src/test/ui/inline-const/const-match-pat-fail.rs:5:9
  |
5 |         1 ..= let 2 => {}
  |         ^^^^^
  |
  = note: see issue #67264 <https://github.com/rust-lang/rust/issues/67264> for more information
  = help: add `#![feature(half_open_range_patterns)]` to the crate attributes to enable

camelid · 2020-10-20T23:33:21Z

In the parser we are looking for const { not just const so it asummes that it's a half-open range with no end. Unsure what would be ok to do with this case but the error doesn't sound great.

I'm trying to work on this in #78168.

petrochenkov · 2020-10-21T20:58:33Z

r=me after rebasing and squashing commits.

spastorino · 2020-10-22T17:29:02Z

@bors r=petrochenkov

bors · 2020-10-22T17:29:04Z

📌 Commit 5656a41 has been approved by petrochenkov

@petrochenkov

…t, r=petrochenkov Make inline const work in range patterns Fixes rust-lang#78108 which is a follow up of rust-lang#77124 r? @petrochenkov

Rollup of 17 pull requests Successful merges: - rust-lang#77268 (Link to "Contributing to Rust" rather than "Getting Started".) - rust-lang#77339 (Implement TryFrom between NonZero types.) - rust-lang#77488 (Mark `repr128` as `incomplete_features`) - rust-lang#77890 (Fixing escaping to ensure generation of welformed json.) - rust-lang#77918 (Cleanup network tests) - rust-lang#77920 (Avoid extraneous space between visibility kw and ident for statics) - rust-lang#77969 (Doc formating consistency between slice sort and sort_unstable, and big O notation consistency) - rust-lang#78098 (Clean up and improve some docs) - rust-lang#78116 (Make inline const work in range patterns) - rust-lang#78153 (Sync LLVM submodule if it has been initialized) - rust-lang#78163 (Clean up lib docs) - rust-lang#78169 (Update cargo) - rust-lang#78231 (Make closures inherit the parent function's target features) - rust-lang#78235 (Explain where the closure return type was inferred) - rust-lang#78255 (Reduce diagram mess in 'match arms have incompatible types' error) - rust-lang#78263 (Add regression test of issue-77668) - rust-lang#78265 (Add some inference-related regression tests about incorrect diagnostics) Failed merges: r? `@ghost`

rust-highfive assigned petrochenkov Oct 19, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 19, 2020

spastorino mentioned this pull request Oct 19, 2020

A problem with inline_const feature in ranges #78108

Closed

camelid added A-patterns Relating to patterns and pattern matching F-inline_const Inline constants (aka: const blocks, const expressions, anonymous constants) A-parser Area: The parsing of Rust source code to an AST labels Oct 19, 2020

petrochenkov reviewed Oct 19, 2020

View reviewed changes

src/test/ui/inline-const/const-match-pat-range.rs Show resolved Hide resolved

petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 19, 2020

spastorino force-pushed the inline-const-in-range-pat branch from b8266d9 to 4b7a2ed Compare October 19, 2020 21:45

spastorino force-pushed the inline-const-in-range-pat branch from 4b7a2ed to 038cdf7 Compare October 19, 2020 22:09

spastorino requested a review from petrochenkov October 20, 2020 00:59

petrochenkov 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 Oct 20, 2020

petrochenkov reviewed Oct 20, 2020

View reviewed changes

petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 20, 2020

spastorino force-pushed the inline-const-in-range-pat branch 2 times, most recently from 5ce71b5 to 55c6566 Compare October 20, 2020 22:26

camelid reviewed Oct 20, 2020

View reviewed changes

src/test/ui/inline-const/const-match-pat-range.rs Outdated Show resolved Hide resolved

spastorino force-pushed the inline-const-in-range-pat branch 2 times, most recently from 5ce71b5 to 55c6566 Compare October 20, 2020 22:33

camelid reviewed Oct 20, 2020

View reviewed changes

spastorino force-pushed the inline-const-in-range-pat branch from e59b2df to 065f046 Compare October 20, 2020 23:00

spastorino requested a review from petrochenkov October 21, 2020 10:32

spastorino removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 21, 2020

spastorino added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 21, 2020

petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 21, 2020

spastorino added 5 commits October 22, 2020 13:21

Rename parse_const_expr to parse_const_block

954b5a8

Make inline const work in range patterns

f8842b9

Make inline const work for half open ranges

83abed9

Add ..= const { .. } missing tests and sort them properly

5bef429

Bless tests

5656a41

spastorino force-pushed the inline-const-in-range-pat branch from 065f046 to 5656a41 Compare October 22, 2020 16:22

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 22, 2020

Dylan-DPC-zz mentioned this pull request Oct 22, 2020

Rollup of 12 pull requests #78245

Closed

camelid mentioned this pull request Oct 22, 2020

Tracking Issue for inline const patterns (RFC 2920) #76001

Open

11 tasks

JohnTitor mentioned this pull request Oct 23, 2020

Rollup of 17 pull requests #78270

Merged

bors merged commit 982c4b3 into rust-lang:master Oct 23, 2020

rustbot added this to the 1.49.0 milestone Oct 23, 2020

petrochenkov mentioned this pull request Oct 24, 2020

Suggest adding missing braces in const block pattern #78173

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make inline const work in range patterns #78116

Make inline const work in range patterns #78116

spastorino commented Oct 19, 2020 •

edited

Loading

petrochenkov commented Oct 19, 2020

spastorino commented Oct 19, 2020

camelid left a comment

spastorino commented Oct 20, 2020

camelid commented Oct 20, 2020

petrochenkov commented Oct 21, 2020 •

edited

Loading

spastorino commented Oct 22, 2020

bors commented Oct 22, 2020

Make inline const work in range patterns #78116

Make inline const work in range patterns #78116

Conversation

spastorino commented Oct 19, 2020 • edited Loading

petrochenkov commented Oct 19, 2020

spastorino commented Oct 19, 2020

camelid left a comment

Choose a reason for hiding this comment

spastorino commented Oct 20, 2020

camelid commented Oct 20, 2020

petrochenkov commented Oct 21, 2020 • edited Loading

spastorino commented Oct 22, 2020

bors commented Oct 22, 2020

spastorino commented Oct 19, 2020 •

edited

Loading

petrochenkov commented Oct 21, 2020 •

edited

Loading