about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMara Bos <m-ou.se@m-ou.se>2020-11-08 13:36:32 +0100
committerGitHub <noreply@github.com>2020-11-08 13:36:32 +0100
commitc4e262ee6f35ac8d501eedc4a52d3b7c779b21fe (patch)
tree3bdde2a52f2d7e9830eb7a3407f35a0ee396337e
parent829e88032a66bc7fc7593d3ea2dfb849477a713f (diff)
parent2550e887b35cea7ceaf5ad07d796f4191fffdb62 (diff)
downloadrust-c4e262ee6f35ac8d501eedc4a52d3b7c779b21fe.tar.gz
rust-c4e262ee6f35ac8d501eedc4a52d3b7c779b21fe.zip
Rollup merge of #78861 - o752d:patch-1, r=jonas-schievink
typo and formatting

fixed a typo and modified some line formatting justification while I'm here :)
-rw-r--r--compiler/rustc_expand/src/placeholders.rs19
1 files changed, 9 insertions, 10 deletions
diff --git a/compiler/rustc_expand/src/placeholders.rs b/compiler/rustc_expand/src/placeholders.rs
index 0cffca17271..e413564fb3f 100644
--- a/compiler/rustc_expand/src/placeholders.rs
+++ b/compiler/rustc_expand/src/placeholders.rs
@@ -313,25 +313,24 @@ impl<'a, 'b> MutVisitor for PlaceholderExpander<'a, 'b> {
             // Implement the proposal described in
             // https://github.com/rust-lang/rust/issues/61733#issuecomment-509626449
             //
-            // The macro invocation expands to the list of statements.
-            // If the list of statements is empty, then 'parse'
-            // the trailing semicolon on the original invocation
-            // as an empty statement. That is:
+            // The macro invocation expands to the list of statements. If the
+            // list of statements is empty, then 'parse' the trailing semicolon
+            // on the original invocation as an empty statement. That is:
             //
             // `empty();` is parsed as a single `StmtKind::Empty`
             //
-            // If the list of statements is non-empty, see if the
-            // final statement alreayd has a trailing semicolon.
+            // If the list of statements is non-empty, see if the final
+            // statement already has a trailing semicolon.
             //
-            // If it doesn't have a semicolon, then 'parse' the trailing semicolon
-            // from the invocation as part of the final statement,
+            // If it doesn't have a semicolon, then 'parse' the trailing
+            // semicolon from the invocation as part of the final statement,
             // using `stmt.add_trailing_semicolon()`
             //
             // If it does have a semicolon, then 'parse' the trailing semicolon
             // from the invocation as a new StmtKind::Empty
 
-            // FIXME: We will need to preserve the original
-            // semicolon token and span as part of #15701
+            // FIXME: We will need to preserve the original semicolon token and
+            // span as part of #15701
             let empty_stmt = ast::Stmt {
                 id: ast::DUMMY_NODE_ID,
                 kind: ast::StmtKind::Empty,