6 files changed, 46 insertions, 5 deletions

diff --git a/appveyor.yml b/appveyor.yml
index cd7d1c2da..a6ba3b0e1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,7 @@
 os: Visual Studio 2015
 
 install:
-  - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
+  - curl https://win.rustup.rs/ --output rustup-init.exe
   - rustup-init -yv --default-toolchain stable --default-host x86_64-pc-windows-msvc
   - set PATH=%PATH%;%USERPROFILE%\.cargo\bin
   - rustc -vV
diff --git a/bors.toml b/bors.toml
index 4e6e85f45..ee7961784 100644
--- a/bors.toml
+++ b/bors.toml
@@ -2,3 +2,4 @@ status = [
   "continuous-integration/travis-ci/push",
   "continuous-integration/appveyor/branch"
 ]
+delete_merged_branches = true
diff --git a/src/parser/event_parser/grammar/items.rs b/src/parser/event_parser/grammar/items.rs
index e569e5047..0638e3093 100644
--- a/src/parser/event_parser/grammar/items.rs
+++ b/src/parser/event_parser/grammar/items.rs
@@ -1,8 +1,8 @@
 use super::*;
 
-pub(super) fn mod_contents(p: &mut Parser) {
+pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) {
     attributes::inner_attributes(p);
-    while !p.at(EOF) {
+    while !p.at(EOF) && !(stop_on_r_curly && p.at(R_CURLY)) {
         item(p);
     }
 }
@@ -152,7 +152,10 @@ fn mod_item(p: &mut Parser) {
     p.bump();
 
     if p.expect(IDENT) && !p.eat(SEMI) {
-        p.curly_block(mod_contents);
+        if p.expect(L_CURLY) {
+            mod_contents(p, true);
+            p.expect(R_CURLY);
+        }
     }
 }
 
diff --git a/src/parser/event_parser/grammar/mod.rs b/src/parser/event_parser/grammar/mod.rs
index 82f8b7f3e..b87f3ca8a 100644
--- a/src/parser/event_parser/grammar/mod.rs
+++ b/src/parser/event_parser/grammar/mod.rs
@@ -11,7 +11,7 @@ mod paths;
 pub(crate) fn file(p: &mut Parser) {
     let file = p.start();
     p.eat(SHEBANG);
-    items::mod_contents(p);
+    items::mod_contents(p, false);
     file.complete(p, FILE);
 }
 
diff --git a/tests/data/parser/err/0007_stray_curly_in_file.rs b/tests/data/parser/err/0007_stray_curly_in_file.rs
new file mode 100644
index 000000000..dc869fb78
--- /dev/null
+++ b/tests/data/parser/err/0007_stray_curly_in_file.rs
@@ -0,0 +1,9 @@
+}
+
+struct S;
+
+}
+
+fn foo(){}
+
+}
diff --git a/tests/data/parser/err/0007_stray_curly_in_file.txt b/tests/data/parser/err/0007_stray_curly_in_file.txt
new file mode 100644
index 000000000..04bf17bc7
--- /dev/null
+++ b/tests/data/parser/err/0007_stray_curly_in_file.txt
@@ -0,0 +1,28 @@
+FILE@[0; 31)
+  ERROR@[0; 3)
+  err: `expected item`
+    R_CURLY@[0; 1)
+    WHITESPACE@[1; 3)
+  STRUCT_ITEM@[3; 14)
+    STRUCT_KW@[3; 9)
+    WHITESPACE@[9; 10)
+    IDENT@[10; 11)
+    SEMI@[11; 12)
+    WHITESPACE@[12; 14)
+  ERROR@[14; 17)
+  err: `expected item`
+    R_CURLY@[14; 15)
+    WHITESPACE@[15; 17)
+  FN_ITEM@[17; 29)
+    FN_KW@[17; 19)
+    WHITESPACE@[19; 20)
+    IDENT@[20; 23)
+    L_PAREN@[23; 24)
+    R_PAREN@[24; 25)
+    L_CURLY@[25; 26)
+    R_CURLY@[26; 27)
+    WHITESPACE@[27; 29)
+  ERROR@[29; 31)
+  err: `expected item`
+    R_CURLY@[29; 30)
+    WHITESPACE@[30; 31)