Auto merge of #41717 - frewsxcv:rollup, r=frewsxcv

Rollup of 7 pull requests - Successful merges: #41217, #41625, #41640, #41653, #41656, #41657, #41705 - Failed merges:
rust-lang · May 3, 2017 · 146dc67 · 146dc67
2 parents 0634f0a + 2b51384
commit 146dc67
Show file tree

Hide file tree

Showing 74 changed files with 1,355 additions and 5,523 deletions.
diff --git a/src/grammar/.gitignore b/src/grammar/.gitignore
diff --git a/src/grammar/README.md b/src/grammar/README.md
diff --git a/src/grammar/RustLexer.g4 b/src/grammar/RustLexer.g4
diff --git a/src/grammar/check.sh b/src/grammar/check.sh