Skip to content

Conversation

@dawidl022
Copy link
Contributor

@dawidl022 dawidl022 commented Dec 6, 2025

Lowering for contract delcarations introduced in #144444 incorrectly handled the final declaration statement when it didn't end in a semicolon. This change fixes the issue.

See the included regression test for the minimal reproducible example.

Contracts tracking issue: #128044

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 6, 2025
@rustbot
Copy link
Collaborator

rustbot commented Dec 6, 2025

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot

This comment has been minimized.

@dawidl022 dawidl022 force-pushed the contracts/fix/parsing-compound-statements branch from 5d50b54 to 0743e5a Compare December 6, 2025 19:21
@rust-log-analyzer

This comment has been minimized.

@dawidl022 dawidl022 force-pushed the contracts/fix/parsing-compound-statements branch from 0743e5a to 5db6d3a Compare December 6, 2025 19:32
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, please #![expect(incomplete_features)] for this test, otherwise looks good.

View changes since this review

@jieyouxu
Copy link
Member

jieyouxu commented Dec 7, 2025

@rustbot author

@rustbot rustbot 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 Dec 7, 2025
@rustbot
Copy link
Collaborator

rustbot commented Dec 7, 2025

Reminder, once the PR becomes ready for a review, use @rustbot ready.

Lowering for contract delcarations incorrectly handled the final
declaration statement when it didn't end in a semicolon. This
change fixes the issue.
@dawidl022 dawidl022 force-pushed the contracts/fix/parsing-compound-statements branch from 5db6d3a to d54fee8 Compare December 7, 2025 09:08
@dawidl022
Copy link
Contributor Author

@rustbot ready

@rustbot rustbot 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 Dec 7, 2025
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jieyouxu
Copy link
Member

jieyouxu commented Dec 7, 2025

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 7, 2025

📌 Commit d54fee8 has been approved by jieyouxu

It is now in the queue for this repository.

@bors 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 Dec 7, 2025
Zalathar added a commit to Zalathar/rust that referenced this pull request Dec 8, 2025
…warning-in-tests, r=Kivooeo,jieyouxu

contracts: clean up feature flag warning duplicated across tests

There is no need for every contracts test to assert the same warning for using the `contracts` feature flag, as such use `#![expect(incomplete_features)]` in the tests, and add one test to specifically check for the warning.

Making this change has been discussed in the comments of rust-lang#149722.

Contracts tracking issue: rust-lang#128044

r? Kivooeo
bors added a commit that referenced this pull request Dec 8, 2025
Rollup of 8 pull requests

Successful merges:

 - #148935 (Fix division syntax in doc comments)
 - #149207 (Add `ilog10` result range hints)
 - #149676 (Tidying up tests/ui/issues tests [3/N])
 - #149710 (Move ambient gdb discovery from compiletest to bootstrap)
 - #149714 (Check associated type where-clauses for lifetimes)
 - #149722 (contracts: fix lowering final declaration without trailing semicolon)
 - #149736 (contracts: clean up feature flag warning duplicated across tests)
 - #149739 (mailmap: add binarycat)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3c2a5db into rust-lang:main Dec 8, 2025
11 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Dec 8, 2025
rust-timer added a commit that referenced this pull request Dec 8, 2025
Rollup merge of #149736 - dawidl022:contracts/chore/cleanup-warning-in-tests, r=Kivooeo,jieyouxu

contracts: clean up feature flag warning duplicated across tests

There is no need for every contracts test to assert the same warning for using the `contracts` feature flag, as such use `#![expect(incomplete_features)]` in the tests, and add one test to specifically check for the warning.

Making this change has been discussed in the comments of #149722.

Contracts tracking issue: #128044

r? Kivooeo
rust-timer added a commit that referenced this pull request Dec 8, 2025
Rollup merge of #149722 - dawidl022:contracts/fix/parsing-compound-statements, r=jieyouxu

contracts: fix lowering final declaration without trailing semicolon

Lowering for contract delcarations introduced in #144444 incorrectly handled the final declaration statement when it didn't end in a semicolon. This change fixes the issue.

See the included regression test for the minimal reproducible example.

Contracts tracking issue: #128044
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants