From 107b4aa32931cf36b1b2d51cd333e8c3387d719e Mon Sep 17 00:00:00 2001
From: Florian Hahn <flo@fhahn.com>
Date: Wed, 21 Oct 2015 18:20:46 +0200
Subject: [PATCH 1/2] Remove bare semicolons

---
 src/librustc/metadata/cstore.rs                | 2 +-
 src/librustc_trans/save/dump_csv.rs            | 2 +-
 src/librustc_trans/trans/debuginfo/metadata.rs | 2 +-
 src/librustdoc/passes.rs                       | 4 ++--
 src/libstd/sys/common/wtf8.rs                  | 4 ++--
 src/libterm/terminfo/searcher.rs               | 2 +-
 src/libtest/lib.rs                             | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/librustc/metadata/cstore.rs b/src/librustc/metadata/cstore.rs
index c0e7667666c..873c22c35d8 100644
--- a/src/librustc/metadata/cstore.rs
+++ b/src/librustc/metadata/cstore.rs
@@ -207,7 +207,7 @@ impl CStore {
                 visit(cstore, dep, ordering);
             }
             ordering.push(cnum);
-        };
+        }
         for (&num, _) in self.metas.borrow().iter() {
             visit(self, num, &mut ordering);
         }
diff --git a/src/librustc_trans/save/dump_csv.rs b/src/librustc_trans/save/dump_csv.rs
index 8a5b8f4eb56..53fd857ffc1 100644
--- a/src/librustc_trans/save/dump_csv.rs
+++ b/src/librustc_trans/save/dump_csv.rs
@@ -58,7 +58,7 @@ macro_rules! down_cast_data {
             data
         } else {
             $this.sess.span_bug($sp, &format!("unexpected data kind: {:?}", $id));
-        };
+        }
     };
 }
 
diff --git a/src/librustc_trans/trans/debuginfo/metadata.rs b/src/librustc_trans/trans/debuginfo/metadata.rs
index aeda8f723cf..62befb3b992 100644
--- a/src/librustc_trans/trans/debuginfo/metadata.rs
+++ b/src/librustc_trans/trans/debuginfo/metadata.rs
@@ -480,7 +480,7 @@ macro_rules! return_if_metadata_created_in_meantime {
                                 .find_metadata_for_unique_id($unique_type_id) {
             Some(metadata) => return MetadataCreationResult::new(metadata, true),
             None => { /* proceed normally */ }
-        };
+        }
     )
 }
 
diff --git a/src/librustdoc/passes.rs b/src/librustdoc/passes.rs
index e7e38220825..1957f1efa47 100644
--- a/src/librustdoc/passes.rs
+++ b/src/librustdoc/passes.rs
@@ -28,7 +28,7 @@ pub fn strip_hidden(krate: clean::Crate) -> plugins::PluginResult {
     let krate = {
         struct Stripper<'a> {
             stripped: &'a mut DefIdSet
-        };
+        }
         impl<'a> fold::DocFolder for Stripper<'a> {
             fn fold_item(&mut self, i: Item) -> Option<Item> {
                 if i.is_hidden_from_doc() {
@@ -60,7 +60,7 @@ pub fn strip_hidden(krate: clean::Crate) -> plugins::PluginResult {
     let krate = {
         struct ImplStripper<'a> {
             stripped: &'a mut DefIdSet
-        };
+        }
         impl<'a> fold::DocFolder for ImplStripper<'a> {
             fn fold_item(&mut self, i: Item) -> Option<Item> {
                 if let clean::ImplItem(clean::Impl{
diff --git a/src/libstd/sys/common/wtf8.rs b/src/libstd/sys/common/wtf8.rs
index a6eada832cd..271aba680a2 100644
--- a/src/libstd/sys/common/wtf8.rs
+++ b/src/libstd/sys/common/wtf8.rs
@@ -1019,7 +1019,7 @@ mod tests {
     fn wtf8buf_from_iterator() {
         fn f(values: &[u32]) -> Wtf8Buf {
             values.iter().map(|&c| CodePoint::from_u32(c).unwrap()).collect::<Wtf8Buf>()
-        };
+        }
         assert_eq!(f(&[0x61, 0xE9, 0x20, 0x1F4A9]).bytes, b"a\xC3\xA9 \xF0\x9F\x92\xA9");
 
         assert_eq!(f(&[0xD83D, 0xDCA9]).bytes, b"\xF0\x9F\x92\xA9");  // Magic!
@@ -1038,7 +1038,7 @@ mod tests {
             let mut string = initial.iter().map(c).collect::<Wtf8Buf>();
             string.extend(extended.iter().map(c));
             string
-        };
+        }
 
         assert_eq!(e(&[0x61, 0xE9], &[0x20, 0x1F4A9]).bytes,
                    b"a\xC3\xA9 \xF0\x9F\x92\xA9");
diff --git a/src/libterm/terminfo/searcher.rs b/src/libterm/terminfo/searcher.rs
index 16062060df0..0e05ac53bc8 100644
--- a/src/libterm/terminfo/searcher.rs
+++ b/src/libterm/terminfo/searcher.rs
@@ -102,7 +102,7 @@ fn test_get_dbpath_for_term() {
     fn x(t: &str) -> String {
         let p = get_dbpath_for_term(t).expect("no terminfo entry found");
         p.to_str().unwrap().to_string()
-    };
+    }
     assert!(x("screen") == "/usr/share/terminfo/s/screen");
     assert!(get_dbpath_for_term("") == None);
     env::set_var("TERMINFO_DIRS", ":");
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index ad00bb66733..cfe75779536 100644
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -924,7 +924,7 @@ pub fn filter_tests(opts: &TestOpts, tests: Vec<TestDescAndFn>) -> Vec<TestDescA
             } else {
                 None
             }
-        };
+        }
         filtered.into_iter().filter_map(filter).collect()
     };
 

From 1e62bd2754d1c83959151e97c871680ca47110dc Mon Sep 17 00:00:00 2001
From: Florian Hahn <flo@fhahn.com>
Date: Sat, 24 Oct 2015 00:45:18 +0200
Subject: [PATCH 2/2] Allow bare semicolon in grammar doc, closes #28157

---
 src/doc/grammar.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/doc/grammar.md b/src/doc/grammar.md
index 403922c5ed1..a400e70e97d 100644
--- a/src/doc/grammar.md
+++ b/src/doc/grammar.md
@@ -436,7 +436,7 @@ meta_seq : meta_item [ ',' meta_seq ] ? ;
 ## Statements
 
 ```antlr
-stmt : decl_stmt | expr_stmt ;
+stmt : decl_stmt | expr_stmt | ';' ;
 ```
 
 ### Declaration statements