Corrects issue #28777 by removing, once a binary operator is found, the

[aaronkeen]

RESTRICTION_STMT_EXPR restriction to allow subsequent expressions to
contain braces.

#28777

[alexcrichton]

r? @eddyb (random @rust-lang/compiler selection)

[eddyb]

This can be written as restrictions - Restrictions::RESTRICTION_STMT_EXPR, AFAIK.

[aaronkeen]

You are correct. I missed the support for - as set difference in bitflags. Thank you.

[eddyb]

@bors r+

[bors]

📌 Commit 41cc365 has been approved by eddyb

[mitaa]

I guess parse-fail/assoc-oddities-3.rsshould be removed?

[steveklabnik]

@bors: r-

this failed the rollup

[aaronkeen]

Yes, parse-fail/assoc-oddities-3.rs fails, as noted in #28777, because it is successfully parsed after this modification which is then consistent with grammar/parser-lalr. Please excuse my ignorance relating to this process, but it is not clear to me if I should remove that test as part of my PR or wait for a confirmation that this is the desired behavior (is grammar/parser-lalr considered the model?).

[aaronkeen]

Committed with test case removed.

[aaronkeen]

The original parse-fail/assoc-oddities-3.rs test has been updated and moved to run-pass. An additional test has been added to run-pass to demonstrate that this modification successfully addresses the issue (this should have been done in the first place).

[nagisa]

ping @eddyb r?

EDIT: @aaronkeen ah, by the way, that test was written by me to ensure my changes to associative operator parsing do not change behaviour of the previous parser (since the changes have been quite extensive). It is (or was), as name suggests, an oddity.

[eddyb]

@bors r+

[bors]

📌 Commit cedd794 has been approved by eddyb

[bors]

⌛ Testing commit cedd794 with merge 37ff5c8...

[bors]

💔 Test failed - auto-linux-64-opt

[aaronkeen]

It seems the following tests timed out. I have examined the tests in code snippets in primitive-types and do not see any code that should have been perturbed by this PR. These tests all passed on my local machine [x86_64-apple-darwin], so I am not sure what the issue is. Is it possible to retrieve information regarding the specific test that failed (the execution order differs from the file and from my machine)?

run doc-book-primitive-types [x86_64-unknown-linux-gnu]
running 15 tests
test Booleans_0 ... ok
test Numeric_types_0 ... ok
test Arrays_0 ... ok
test Functions_0 ... ok
test Arrays_3 ... ok
test Arrays_1 ... ok
test Slices_0 ... ok
test Arrays_2 ... ok
command timed out: 1200 seconds without output running ['make', 'check'], attempting to kill
program finished with exit code 2
elapsedTime=2936.921062

[nagisa]

@aaronkeen I believe the failure is spurious and a few retries should make it go away.

[aturon]

@bors: retry

[bors]

⌛ Testing commit cedd794 with merge 2370d46...

[bors]

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt