Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix expression and statement grammar. #776

Merged
merged 1 commit into from
Mar 7, 2020
Merged

Fix expression and statement grammar. #776

merged 1 commit into from
Mar 7, 2020

Conversation

steffahn
Copy link
Member

@steffahn steffahn commented Mar 4, 2020

Semicolon or comma in expression statements or match arms, respectively, are optional, but part of the statement / match arm.
Also remove a note about proc-macros from the page about BlockExpression.
Closes #773 and closes #774.

@steffahn
Copy link
Member Author

steffahn commented Mar 4, 2020

I just understood how the links in the markdown work. I'll have to fix those before merging this.
Edit: done.

Semicolon or comma in expression statements or match arms, respectively, are optional, but part of the statement / match arm.
Also remove a note about proc-macros from the page about BlockExpression.
Closes #773 and closes #774.
@Centril
Copy link
Contributor

Centril commented Mar 7, 2020

Thanks!

@Centril Centril merged commit 0249af4 into rust-lang:master Mar 7, 2020
@steffahn steffahn deleted the expr_and_blocks branch March 8, 2020 19:52
Centril added a commit to Centril/rust that referenced this pull request Mar 17, 2020
Update books

## reference

4 commits in 559e09c..e2f11fe
2020-03-02 01:17:14 +0100 to 2020-03-10 06:59:24 +0100
- Update rustc-guide to rustc-dev-guide (rust-lang/reference#777)
- Fix expression and statement grammar. (rust-lang/reference#776)
- Fix grammar for tuple struct patterns. (rust-lang/reference#775)
- A typo? (rust-lang/reference#770)

## rust-by-example

3 commits in db57f899ea2a56a544c8d280cbf033438666273d..cb369ae95ca36b841960182d26f6d5d9b2e3cc18
2020-02-18 17:46:46 -0300 to 2020-03-14 12:13:22 -0500
- Use rust-lang/rust linkchecker on CI. (rust-lang/rust-by-example#1310)
- Rewrite freeze.md (rust-lang/rust-by-example#1314)
- Clarify type suffixing with example (rust-lang/rust-by-example#1312)

## embedded-book

2 commits in b81ffb7a6f4c5aaed92786e770e99db116aa4ebd..d22a9c487c78095afc4584f1d9b4ec43529d713c
2020-02-27 08:06:04 +0000 to 2020-03-04 09:46:30 +0000
- Updated documentation on profile-overrides  (rust-embedded/book#230)
- Update information on Cargo `profile-overrides`  (rust-embedded/book#229)
Centril added a commit to Centril/rust that referenced this pull request Mar 17, 2020
Update books

## reference

4 commits in 559e09c..e2f11fe
2020-03-02 01:17:14 +0100 to 2020-03-10 06:59:24 +0100
- Update rustc-guide to rustc-dev-guide (rust-lang/reference#777)
- Fix expression and statement grammar. (rust-lang/reference#776)
- Fix grammar for tuple struct patterns. (rust-lang/reference#775)
- A typo? (rust-lang/reference#770)

## rust-by-example

3 commits in db57f899ea2a56a544c8d280cbf033438666273d..cb369ae95ca36b841960182d26f6d5d9b2e3cc18
2020-02-18 17:46:46 -0300 to 2020-03-14 12:13:22 -0500
- Use rust-lang/rust linkchecker on CI. (rust-lang/rust-by-example#1310)
- Rewrite freeze.md (rust-lang/rust-by-example#1314)
- Clarify type suffixing with example (rust-lang/rust-by-example#1312)

## embedded-book

2 commits in b81ffb7a6f4c5aaed92786e770e99db116aa4ebd..d22a9c487c78095afc4584f1d9b4ec43529d713c
2020-02-27 08:06:04 +0000 to 2020-03-04 09:46:30 +0000
- Updated documentation on profile-overrides  (rust-embedded/book#230)
- Update information on Cargo `profile-overrides`  (rust-embedded/book#229)
Centril added a commit to Centril/rust that referenced this pull request Mar 17, 2020
Update books

## reference

4 commits in 559e09c..e2f11fe
2020-03-02 01:17:14 +0100 to 2020-03-10 06:59:24 +0100
- Update rustc-guide to rustc-dev-guide (rust-lang/reference#777)
- Fix expression and statement grammar. (rust-lang/reference#776)
- Fix grammar for tuple struct patterns. (rust-lang/reference#775)
- A typo? (rust-lang/reference#770)

## rust-by-example

3 commits in db57f899ea2a56a544c8d280cbf033438666273d..cb369ae95ca36b841960182d26f6d5d9b2e3cc18
2020-02-18 17:46:46 -0300 to 2020-03-14 12:13:22 -0500
- Use rust-lang/rust linkchecker on CI. (rust-lang/rust-by-example#1310)
- Rewrite freeze.md (rust-lang/rust-by-example#1314)
- Clarify type suffixing with example (rust-lang/rust-by-example#1312)

## embedded-book

2 commits in b81ffb7a6f4c5aaed92786e770e99db116aa4ebd..d22a9c487c78095afc4584f1d9b4ec43529d713c
2020-02-27 08:06:04 +0000 to 2020-03-04 09:46:30 +0000
- Updated documentation on profile-overrides  (rust-embedded/book#230)
- Update information on Cargo `profile-overrides`  (rust-embedded/book#229)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants