# Merge remote-tracking branch 'origin/master' into stage2-whole-file-astgen · gitcafe/zig

[View on GitCafe](https://git.cafe/gitcafe/zig/commit/e86cee258cb0eefca14a94f6b3abb39e8a5f2ef9)

Repository: [gitcafe/zig](https://git.cafe/gitcafe/zig)

Visibility: public

Requested revision: e86cee258cb0eefca14a94f6b3abb39e8a5f2ef9

Requested commit: e86cee258cb0eefca14a94f6b3abb39e8a5f2ef9

Commit: e86cee258cb0eefca14a94f6b3abb39e8a5f2ef9

Tree: 6d9aa3b21685b1581787246f953db94cdb486693

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge remote-tracking branch 'origin/master' into stage2-whole-file-astgen

In particular I wanted the change that makes `suspend;` illegal in the
parser.

```

## Parents

- [224fbb23c44628b215662c6199dff11cc2851f04](https://git.cafe/gitcafe/zig/commit/224fbb23c44628b215662c6199dff11cc2851f04?format=markdown)

- [8530b6b7242ebf43b5cb4ae3a2644593f4961a5e](https://git.cafe/gitcafe/zig/commit/8530b6b7242ebf43b5cb4ae3a2644593f4961a5e?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zig/tree/e86cee258cb0eefca14a94f6b3abb39e8a5f2ef9?format=markdown)