Reject integer suffix when tuple indexing #59421

estebank · 2019-03-25T23:11:47Z

estebank · 2019-03-25T23:12:59Z

Fixed indenting in the block, you can ignore the whitespace changes with https://github.com/rust-lang/rust/pull/59421/files?w=1

src/libsyntax/parse/parser.rs

varkor · 2019-03-25T23:16:05Z

The message could probably be rephrased to sound less awkward, but r=me either way.

varkor · 2019-03-25T23:16:57Z

Fixed indenting in the block

I had done exactly the same thing 😄

src/test/ui/parser/issue-59418.rs

estebank · 2019-03-26T04:39:24Z

@bors r=varkor

bors · 2019-03-26T04:39:25Z

📌 Commit 6ad77b0 has been approved by varkor

src/libsyntax/parse/parser.rs

petrochenkov · 2019-03-26T06:59:52Z

I was going to blame beginner contributors and diagnostic improvements for this regression, but it turned out it was me - 44acea4.

petrochenkov · 2019-03-26T07:31:21Z

@estebank
Could you also add test cases for suffixed literals in fields in struct expressions and struct patterns.

let s = S { 0suffix: 0 };
match s {
    S { 0suffix: _ } => {}
}

Centril · 2019-03-26T09:15:40Z

@petrochenkov @estebank This is already r+ed, should we add the extra test cases in follow up PRs? (or do you want to r-?)

estebank · 2019-03-26T16:53:29Z

@bors r-

estebank · 2019-03-26T17:20:06Z

Added the requested changes. r? @petrochenkov, can you take a look to give final approval?

For the case you asked the output is

error: expected identifier, found `0suffix`
  --> src/main.rs:12:17
   |
12 |     let s = X { 0suffix: 0, 1: 1, 2: 2 };
   |             -   ^^^^^^^ expected identifier
   |             |
   |             while parsing this struct

error: expected identifier, found `0suffix`
  --> src/main.rs:15:13
   |
15 |         X { 0suffix: _, .. } => {}
   |             ^^^^^^^ expected identifier

error[E0063]: missing field `0` in initializer of `X`
  --> src/main.rs:12:13
   |
12 |     let s = X { 0suffix: 0, 1: 1, 2: 2 };
   |             ^ missing `0`

error[E0027]: pattern does not mention fields `0`, `1`, `2`
  --> src/main.rs:15:9
   |
15 |         X { 0suffix: _, .. } => {}
   |         ^^^^^^^^^^^^^^^^^^^^ missing fields `0`, `1`, `2`
   |
   = note: trying to match a tuple variant with a struct variant pattern

Which is why I think it shouldn't be added to the test, as it is not handled by this PR.

src/libsyntax/parse/parser.rs

petrochenkov · 2019-03-26T18:41:40Z

@estebank

Which is why I think it shouldn't be added to the test, as it is not handled by this PR.

I think what this PR is doing (accept suffixed literal, report a non-fatal error, continue) is a better alternative than "expected identifier, found 0suffix", so we can use it for struct expressions/patterns as well and unify the diagnostics.

…ield name

estebank · 2019-03-26T19:33:10Z

@petrochenkov

I see. Fixed.

petrochenkov · 2019-03-26T20:40:51Z

Thanks!
@bors r+

bors · 2019-03-26T20:40:52Z

📌 Commit 8d1cc72 has been approved by petrochenkov

@varkor

…ochenkov Reject integer suffix when tuple indexing Fix rust-lang#59418. r? @varkor

kpp · 2019-03-27T13:07:06Z

src/test/ui/parser/issue-59418.rs

+    let d = c.1suffix;
+    //~^ ERROR suffixes on a tuple index are invalid
+    println!("{}", d);
+    let s = X { 0suffix: 0, 1: 1, 2: 2 };


How about X { 0usize: 0, 1: 1, 2: 2 };?

(don't r- the PR in either case since it's in a rollup now... if changes need to be made, do it in a follow up PR)

@varkor

…ochenkov Reject integer suffix when tuple indexing Fix rust-lang#59418. r? @varkor

@varkor

…ochenkov Reject integer suffix when tuple indexing Fix rust-lang#59418. r? @varkor

@ghost

Rollup of 18 pull requests Successful merges: - #57293 (Make some lints incremental) - #57565 (syntax: Remove warning for unnecessary path disambiguators) - #58253 (librustc_driver => 2018) - #58837 (librustc_interface => 2018) - #59268 (Add suggestion to use `&*var` when `&str: From<String>` is expected) - #59283 (Make ASCII case conversions more than 4× faster) - #59284 (adjust MaybeUninit API to discussions) - #59372 (add rustfix-able suggestions to trim_{left,right} deprecations) - #59390 (Make `ptr::eq` documentation mention fat-pointer behavior) - #59393 (Refactor tuple comparison tests) - #59420 ([CI] record docker image info for reuse) - #59421 (Reject integer suffix when tuple indexing) - #59430 (Renames `EvalContext` to `InterpretCx`) - #59439 (Generalize diagnostic for `x = y` where `bool` is the expected type) - #59449 (fix: Make incremental artifact deletion more robust) - #59451 (Add `Default` to `std::alloc::System`) - #59459 (Add some tests) - #59460 (Include id in Thread's Debug implementation) Failed merges: r? @ghost

Reject integer suffix when tuple indexing

91b7423

rust-highfive assigned varkor Mar 25, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 25, 2019

varkor reviewed Mar 25, 2019

View reviewed changes

src/libsyntax/parse/parser.rs Outdated Show resolved Hide resolved

kpp reviewed Mar 25, 2019

View reviewed changes

src/test/ui/parser/issue-59418.rs Show resolved Hide resolved

review comments

6ad77b0

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 Mar 26, 2019

petrochenkov reviewed Mar 26, 2019

View reviewed changes

src/libsyntax/parse/parser.rs Outdated Show resolved Hide resolved

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 Mar 26, 2019

Use expect_no_suffix for error

c7ddb83

rust-highfive assigned petrochenkov and unassigned varkor Mar 26, 2019

varkor reviewed Mar 26, 2019

View reviewed changes

src/libsyntax/parse/parser.rs Outdated Show resolved Hide resolved

estebank added 2 commits March 26, 2019 12:09

Reword invalid suffixe errors

1bb3694

Add specific message for tuple struct invoked with suffixed numeric f…

8d1cc72

…ield name

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 Mar 26, 2019

Centril added a commit to Centril/rust that referenced this pull request Mar 27, 2019

Rollup merge of rust-lang#59421 - estebank:tuple-index-suffix, r=petr…

892c18b

…ochenkov Reject integer suffix when tuple indexing Fix rust-lang#59418. r? @varkor

Centril mentioned this pull request Mar 27, 2019

Rollup of 13 pull requests #59457

Closed

kpp reviewed Mar 27, 2019

View reviewed changes

Centril added a commit to Centril/rust that referenced this pull request Mar 27, 2019

Rollup merge of rust-lang#59421 - estebank:tuple-index-suffix, r=petr…

d3119e4

…ochenkov Reject integer suffix when tuple indexing Fix rust-lang#59418. r? @varkor

Centril mentioned this pull request Mar 27, 2019

Rollup of 17 pull requests #59466

Closed

cuviper added a commit to cuviper/rust that referenced this pull request Mar 28, 2019

Rollup merge of rust-lang#59421 - estebank:tuple-index-suffix, r=petr…

be34621

…ochenkov Reject integer suffix when tuple indexing Fix rust-lang#59418. r? @varkor

cuviper mentioned this pull request Mar 28, 2019

Rollup of 18 pull requests #59471

Merged

bors merged commit 8d1cc72 into rust-lang:master Mar 28, 2019

taiki-e mentioned this pull request Mar 30, 2019

Tuple indexing regression #59553

Closed

This was referenced Apr 1, 2019

(CRO-53) Balance tracking and synchronisation crypto-com/thaler#25

Merged

zeroize_derive: Build fails on latest nightly iqlusioninc/crates#172

Closed

estebank deleted the tuple-index-suffix branch November 9, 2023 05:19

jieyouxu mentioned this pull request Aug 16, 2025

Reject invalid literal suffixes in tuple indexing, tuple struct indexing, and struct field name position #145463

Open

3 tasks

Reject integer suffix when tuple indexing #59421

Reject integer suffix when tuple indexing #59421

Uh oh!

Conversation

estebank commented Mar 25, 2019

Uh oh!

estebank commented Mar 25, 2019

Uh oh!

Uh oh!

varkor commented Mar 25, 2019

Uh oh!

varkor commented Mar 25, 2019

Uh oh!

Uh oh!

estebank commented Mar 26, 2019

Uh oh!

bors commented Mar 26, 2019

Uh oh!

Uh oh!

petrochenkov commented Mar 26, 2019

Uh oh!

petrochenkov commented Mar 26, 2019

Uh oh!

Centril commented Mar 26, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

estebank commented Mar 26, 2019

Uh oh!

estebank commented Mar 26, 2019

Uh oh!

Uh oh!

petrochenkov commented Mar 26, 2019

Uh oh!

estebank commented Mar 26, 2019

Uh oh!

petrochenkov commented Mar 26, 2019

Uh oh!

bors commented Mar 26, 2019

Uh oh!

kpp Mar 27, 2019

Choose a reason for hiding this comment

Uh oh!

Centril Mar 27, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Centril commented Mar 26, 2019 •

edited

Loading