encode `;` stmt without expr as `StmtKind::Empty` #69506

Centril · 2020-02-27T03:29:42Z

Instead of encoding ; statements without a an expression as a tuple in AST, encode it as ast::StmtKind::Empty.

r? @petrochenkov

Centril · 2020-02-27T03:30:09Z

Let's see whether this happens to regress perf: @bors try @rust-timer queue

rust-timer · 2020-02-27T03:30:10Z

Awaiting bors try build completion

bors · 2020-02-27T03:30:19Z

⌛ Trying commit fcea184 with merge 1d82a25...

@petrochenkov

encode `;` stmt without expr as `StmtKind::Semi(None)` Instead of encoding `;` statements without a an expression as a tuple in AST, we modify `ast::StmtKind::Semi` to accept an `Option<_>` and then encode the `;` with `StmtKind::Semi(None)`. r? @petrochenkov

bors · 2020-02-27T06:26:19Z

☀️ Try build successful - checks-azure
Build commit: 1d82a25 (1d82a2587146bc8a4282105545cd257ba2e3647b)

rust-timer · 2020-02-27T06:26:21Z

Queued 1d82a25 with parent 0c15adc, future comparison URL.

Centril · 2020-02-28T04:46:26Z

Seems like this resulted in a perf win rather than a regression, ostensibly because we avoid span_to_snippet.

petrochenkov · 2020-02-29T13:56:46Z

Let's make it a separate StmtKind instead.

The semicolon statement is subtly different from EXPR;, i.e. in the next example

macro_rules! empty { () => {} }

fn foo() -> u8 {
    { 0 }
    
    empty!();
}

empty!(); expands into a semicolon statement in the token-based expansion model (#61733), but { 0 } is still treated as a trailing return statement in this case.

The PR that turned redundant semicolons into statements in AST for diagnostics walked some dangerous road, I really hope it didn't introduce anything incompatible with the macro expansion plans.

src/test/ui/consts/const_let_eq.rs

Centril · 2020-02-29T14:06:07Z

Let's make it a separate StmtKind instead.

Hmm... Do you have any naming suggestions?

petrochenkov · 2020-02-29T14:11:02Z

I really hope it didn't introduce anything incompatible with the macro expansion plans.

It actually regressed some things, but it looks like it's possible to fix them backward-compatibly.

macro_rules! empty { () => {} }

fn foo() -> u8 {
    { 0 }
    
    empty!();; // Works on 1.38, error on 1.39
}

petrochenkov · 2020-02-29T14:16:31Z

Hmm... Do you have any naming suggestions?

Well.
StmtKind::Empty?

In C++ it's officially known as null statement, but I can't say I like that naming.

Centril · 2020-02-29T14:20:20Z

::Empty works for me; the other idea I had was ::Semi + ::SemiExpr(..) but ::Empty feels less like talking about lexical syntax, so it's nicer.

Centril · 2020-02-29T14:52:15Z

Changed to ::Empty and fixed the lint naming.

src/librustc_ast_lowering/lib.rs

src/test/ui/consts/const_let_eq.rs

src/librustc_ast_lowering/expr.rs

petrochenkov · 2020-02-29T15:25:37Z

r=me with the remaining nit addressed.

Centril · 2020-02-29T15:27:07Z

@bors r=petrochenkov

bors · 2020-02-29T15:27:09Z

📌 Commit 6a5de134879c7781a713d9b0d23a22aa5fdd5131 has been approved by petrochenkov

Centril · 2020-03-01T22:03:07Z

@bors r=petrochenkov

bors · 2020-03-01T22:03:08Z

📌 Commit 176fe3f has been approved by petrochenkov

bors · 2020-03-03T19:57:13Z

⌛ Testing commit 176fe3f with merge 4ad6248...

bors · 2020-03-03T23:26:32Z

☀️ Test successful - checks-azure
Approved by: petrochenkov
Pushing 4ad6248 to master...

rust-highfive · 2020-03-03T23:27:47Z

📣 Toolstate changed by #69506!

Tested on commit 4ad6248.
Direct link to PR: #69506

💔 clippy-driver on windows: test-pass → test-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
💔 clippy-driver on linux: test-pass → test-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).

@mcarton

Tested on commit rust-lang/rust@4ad6248. Direct link to PR: <rust-lang/rust#69506> 💔 clippy-driver on windows: test-pass → test-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq). 💔 clippy-driver on linux: test-pass → test-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).

Rustup to rust-lang/rust#69506 changelog: none

Changes: ```` Rustup to rust-lang#69506 Revive rls integration test use question mark operator Add regression test Use `try_eval_usize` over `eval_usize` Add path for display trait Use lang items instead of get_trait_def_id where possible Update stderr Don't lint debug formatting in debug impl Whitelist unused attribute for use items. add test for rust-lang#5238 ````

@oli-obk

submodules: update clippy from 8b7f7e6 to 74eae9d Changes: ```` Rustup to #69506 Revive rls integration test use question mark operator Add regression test Use `try_eval_usize` over `eval_usize` Add path for display trait Use lang items instead of get_trait_def_id where possible Update stderr Don't lint debug formatting in debug impl Whitelist unused attribute for use items. add test for #5238 ```` Makes clippy tests pass again. r? @oli-obk

Changes: ```` Apply suggestions from code review Simplify if_chain. Move NumericLiteral to its own module. Included binary and octal cases. Resolve false positives for hex int cast. Test for unnecessary_cast of hex int literal. run-rustfix Lint `if let Some` in question_mark lint Add restrictive pat use in full binded struct Update test case answers to match cargo dev fmt Ran cargo dev fmt Rustup to rust-lang#69506 Recommended changes from flip1995 Revive rls integration test use question mark operator Add regression test Use `try_eval_usize` over `eval_usize` Add path for display trait Use lang items instead of get_trait_def_id where possible Update stderr Don't lint debug formatting in debug impl Whitelist unused attribute for use items. Fix one last test issue Refactor suggested by krishna-veerareddy Fixed compile error from merging Changed test output to reflect cargo fmt Run cargo dev fmt Finished checking for cases of absolute values add test for rust-lang#5238 Some bugfixing Created floating point abs lint and test, but not yet run ````

@oli-obk

submodules: update clippy from 8b7f7e6 to 74eae9d Changes: ```` Rustup to #69506 Revive rls integration test use question mark operator Add regression test Use `try_eval_usize` over `eval_usize` Add path for display trait Use lang items instead of get_trait_def_id where possible Update stderr Don't lint debug formatting in debug impl Whitelist unused attribute for use items. add test for #5238 ```` Makes clippy tests pass again. r? @oli-obk

Changes: ```` Apply suggestions from code review Simplify if_chain. Move NumericLiteral to its own module. Included binary and octal cases. Resolve false positives for hex int cast. Test for unnecessary_cast of hex int literal. run-rustfix Lint `if let Some` in question_mark lint Add restrictive pat use in full binded struct Update test case answers to match cargo dev fmt Ran cargo dev fmt Rustup to rust-lang/rust#69506 Recommended changes from flip1995 Revive rls integration test use question mark operator Add regression test Use `try_eval_usize` over `eval_usize` Add path for display trait Use lang items instead of get_trait_def_id where possible Update stderr Don't lint debug formatting in debug impl Whitelist unused attribute for use items. Fix one last test issue Refactor suggested by krishna-veerareddy Fixed compile error from merging Changed test output to reflect cargo fmt Run cargo dev fmt Finished checking for cases of absolute values add test for rust-lang#5238 Some bugfixing Created floating point abs lint and test, but not yet run ````

rust-highfive assigned petrochenkov Feb 27, 2020

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

petrochenkov reviewed Feb 29, 2020

View reviewed changes

src/test/ui/consts/const_let_eq.rs Outdated 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 Feb 29, 2020

Centril force-pushed the stmt-semi-none branch from fcea184 to d7291db Compare February 29, 2020 14:50

Centril changed the title ~~encode ; stmt without expr as StmtKind::Semi(None)~~ encode ; stmt without expr as StmtKind::Empty Feb 29, 2020

Centril 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 Feb 29, 2020

petrochenkov reviewed Feb 29, 2020

View reviewed changes

src/librustc_ast_lowering/lib.rs Outdated Show resolved Hide resolved

src/test/ui/consts/const_let_eq.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 Feb 29, 2020

Centril force-pushed the stmt-semi-none branch from d7291db to 7beba1f Compare February 29, 2020 15:21

petrochenkov reviewed Feb 29, 2020

View reviewed changes

src/librustc_ast_lowering/expr.rs Outdated Show resolved Hide resolved

Centril force-pushed the stmt-semi-none branch from 7beba1f to 6a5de13 Compare February 29, 2020 15:26

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 Feb 29, 2020

This comment has been minimized.

# to view

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 1, 2020

encode ; stmt w/o expr as StmtKind::Empty

176fe3f

Centril force-pushed the stmt-semi-none branch from 6a5de13 to 176fe3f Compare March 1, 2020 22:02

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 1, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 3, 2020

bors merged commit 4ad6248 into rust-lang:master Mar 3, 2020

This was referenced Mar 3, 2020

Permit attributes on 'if' expressions #69201

Merged

ast: Mac/Macro -> MacCall #69589

Merged

Centril deleted the stmt-semi-none branch March 3, 2020 23:51

flip1995 added a commit to flip1995/rust-clippy that referenced this pull request Mar 3, 2020

Rustup to rust-lang/rust#69506

a640696

bors added a commit to rust-lang/rust-clippy that referenced this pull request Mar 4, 2020

Auto merge of #5264 - flip1995:rustup, r=flip1995

74eae9d

Rustup to rust-lang/rust#69506 changelog: none

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

encode `;` stmt without expr as `StmtKind::Empty` #69506

encode `;` stmt without expr as `StmtKind::Empty` #69506

Centril commented Feb 27, 2020 •

edited

Loading

Centril commented Feb 27, 2020

rust-timer commented Feb 27, 2020

bors commented Feb 27, 2020

bors commented Feb 27, 2020

rust-timer commented Feb 27, 2020

Centril commented Feb 28, 2020

petrochenkov commented Feb 29, 2020

Centril commented Feb 29, 2020

petrochenkov commented Feb 29, 2020

petrochenkov commented Feb 29, 2020

Centril commented Feb 29, 2020

Centril commented Feb 29, 2020

petrochenkov commented Feb 29, 2020

Centril commented Feb 29, 2020

bors commented Feb 29, 2020

This comment has been minimized.

Centril commented Mar 1, 2020

bors commented Mar 1, 2020

bors commented Mar 3, 2020

bors commented Mar 3, 2020

rust-highfive commented Mar 3, 2020

encode ; stmt without expr as StmtKind::Empty #69506

encode ; stmt without expr as StmtKind::Empty #69506

Conversation

Centril commented Feb 27, 2020 • edited Loading

Centril commented Feb 27, 2020

rust-timer commented Feb 27, 2020

bors commented Feb 27, 2020

bors commented Feb 27, 2020

rust-timer commented Feb 27, 2020

Centril commented Feb 28, 2020

petrochenkov commented Feb 29, 2020

Centril commented Feb 29, 2020

petrochenkov commented Feb 29, 2020

petrochenkov commented Feb 29, 2020

Centril commented Feb 29, 2020

Centril commented Feb 29, 2020

petrochenkov commented Feb 29, 2020

Centril commented Feb 29, 2020

bors commented Feb 29, 2020

This comment has been minimized.

Centril commented Mar 1, 2020

bors commented Mar 1, 2020

bors commented Mar 3, 2020

bors commented Mar 3, 2020

rust-highfive commented Mar 3, 2020

encode `;` stmt without expr as `StmtKind::Empty` #69506

encode `;` stmt without expr as `StmtKind::Empty` #69506

Centril commented Feb 27, 2020 •

edited

Loading