Skip to content

Commit

Permalink
Auto merge of rust-lang#64946 - Centril:rollup-66mj5o0, r=Centril
Browse files Browse the repository at this point in the history
Rollup of 10 pull requests

Successful merges:

 - rust-lang#63674 (syntax: Support modern attribute syntax in the `meta` matcher)
 - rust-lang#63931 (Stabilize macros in some more positions)
 - rust-lang#64887 (syntax: recover trailing `|` in or-patterns)
 - rust-lang#64895 (async/await: improve not-send errors)
 - rust-lang#64896 (Remove legacy grammar)
 - rust-lang#64907 (A small amount of tidying-up factored out from PR rust-lang#64648)
 - rust-lang#64928 (Add tests for some issues)
 - rust-lang#64930 (Silence unreachable code lint from await desugaring)
 - rust-lang#64935 (Improve code clarity)
 - rust-lang#64937 (Deduplicate closure type errors)

Failed merges:

r? @ghost
  • Loading branch information
bors committed Oct 1, 2019
2 parents 42ec683 + 46bf6ad commit 702b45e
Show file tree
Hide file tree
Showing 103 changed files with 1,291 additions and 4,575 deletions.
813 changes: 4 additions & 809 deletions src/doc/grammar.md

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions src/grammar/.gitignore

This file was deleted.

350 changes: 0 additions & 350 deletions src/grammar/lexer.l

This file was deleted.

Loading

0 comments on commit 702b45e

Please sign in to comment.