about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJeffrey Seyfried <jeffrey.seyfried@gmail.com>2016-07-02 15:49:50 +0000
committerJeffrey Seyfried <jeffrey.seyfried@gmail.com>2016-07-12 04:31:40 +0000
commit337236870dd33497e921aa6a0227533f47fac852 (patch)
tree23d2462e7b3e2a0a7d256788e49476ead124d243
parent57c56dd7e04bcd25ed578f27e65ec2379299f44b (diff)
downloadrust-337236870dd33497e921aa6a0227533f47fac852.tar.gz
rust-337236870dd33497e921aa6a0227533f47fac852.zip
Fix fallout.
-rw-r--r--src/doc/book/macros.md4
-rw-r--r--src/librustc_save_analysis/dump_visitor.rs2
-rw-r--r--src/test/compile-fail/macro-incomplete-parse.rs2
-rw-r--r--src/test/run-pass/simd-intrinsic-generic-cast.rs2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/doc/book/macros.md b/src/doc/book/macros.md
index f535fb96af8..9f40829f423 100644
--- a/src/doc/book/macros.md
+++ b/src/doc/book/macros.md
@@ -328,7 +328,7 @@ invocation site. Code such as the following will not work:
 
 ```rust,ignore
 macro_rules! foo {
-    () => (let x = 3);
+    () => (let x = 3;);
 }
 
 fn main() {
@@ -342,7 +342,7 @@ tagged with the right syntax context.
 
 ```rust
 macro_rules! foo {
-    ($v:ident) => (let $v = 3);
+    ($v:ident) => (let $v = 3;);
 }
 
 fn main() {
diff --git a/src/librustc_save_analysis/dump_visitor.rs b/src/librustc_save_analysis/dump_visitor.rs
index 4ffb5477305..5e967f3250f 100644
--- a/src/librustc_save_analysis/dump_visitor.rs
+++ b/src/librustc_save_analysis/dump_visitor.rs
@@ -57,7 +57,7 @@ macro_rules! down_cast_data {
             data
         } else {
             span_bug!($sp, "unexpected data kind: {:?}", $id);
-        }
+        };
     };
 }
 
diff --git a/src/test/compile-fail/macro-incomplete-parse.rs b/src/test/compile-fail/macro-incomplete-parse.rs
index 8d515622e53..c2ac99d1f6a 100644
--- a/src/test/compile-fail/macro-incomplete-parse.rs
+++ b/src/test/compile-fail/macro-incomplete-parse.rs
@@ -19,7 +19,7 @@ macro_rules! ignored_item {
 }
 
 macro_rules! ignored_expr {
-    () => ( 1,  //~ ERROR expected expression, found `,`
+    () => ( 1,  //~ ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `,`
             2 )
 }
 
diff --git a/src/test/run-pass/simd-intrinsic-generic-cast.rs b/src/test/run-pass/simd-intrinsic-generic-cast.rs
index a20dd3ef72a..74c0f39e2e3 100644
--- a/src/test/run-pass/simd-intrinsic-generic-cast.rs
+++ b/src/test/run-pass/simd-intrinsic-generic-cast.rs
@@ -113,7 +113,7 @@ fn main() {
         // product macro
         ($from: ident $(, $from_: ident)*: $($to: ident),*) => {
             fn $from() { unsafe { $( test!($from, $to); )* } }
-            tests!($($from_),*: $($to),*)
+            tests!($($from_),*: $($to),*);
         };
         ($($types: ident),*) => {{
             tests!($($types),* : $($types),*);