From d79f7cde061f18d354d914393640f9c1aacf45a8 Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Thu, 18 Jan 2018 20:59:38 +0300
Subject: [PATCH] Add tests

---
 src/test/parse-fail/closure-return-syntax.rs  |  2 +-
 .../parse-fail/impl-trait-plus-priority.rs    | 47 +++++++++++++++++++
 src/test/parse-fail/issue-24780.rs            |  2 +-
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 src/test/parse-fail/impl-trait-plus-priority.rs

diff --git a/src/test/parse-fail/closure-return-syntax.rs b/src/test/parse-fail/closure-return-syntax.rs
index 1da67359180..4c77edec56f 100644
--- a/src/test/parse-fail/closure-return-syntax.rs
+++ b/src/test/parse-fail/closure-return-syntax.rs
@@ -13,5 +13,5 @@
 
 fn main() {
     let x = || -> i32 22;
-    //~^ ERROR expected one of `!`, `(`, `::`, `<`, or `{`, found `22`
+    //~^ ERROR expected one of `!`, `(`, `+`, `::`, `<`, or `{`, found `22`
 }
diff --git a/src/test/parse-fail/impl-trait-plus-priority.rs b/src/test/parse-fail/impl-trait-plus-priority.rs
new file mode 100644
index 00000000000..6d12a68cf3d
--- /dev/null
+++ b/src/test/parse-fail/impl-trait-plus-priority.rs
@@ -0,0 +1,47 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// compile-flags: -Z parse-only -Z continue-parse-after-error
+
+fn f() -> impl A + B {} // OK
+fn f() -> dyn A + B {} // OK
+fn f() -> A + B {} // OK
+
+impl S {
+    fn f(self) -> impl A + B { // OK
+        let _ = |a, b| -> impl A + B {}; // OK
+    }
+    fn f(self) -> dyn A + B { // OK
+        let _ = |a, b| -> dyn A + B {}; // OK
+    }
+    fn f(self) -> A + B { // OK
+        let _ = |a, b| -> A + B {}; // OK
+    }
+}
+
+type A = fn() -> impl A + B;
+//~^ ERROR expected a path on the left-hand side of `+`, not `fn() -> impl A`
+type A = fn() -> dyn A + B;
+//~^ ERROR expected a path on the left-hand side of `+`, not `fn() -> dyn A`
+type A = fn() -> A + B;
+//~^ ERROR expected a path on the left-hand side of `+`, not `fn() -> A`
+
+type A = Fn() -> impl A + B; // OK, interpreted as `(Fn() -> impl A) + B`
+type A = Fn() -> dyn A + B; // OK, interpreted as `(Fn() -> dyn A) + B`
+type A = Fn() -> A + B; // OK, interpreted as `(Fn() -> A) + B`
+
+type A = &impl A + B;
+//~^ ERROR expected a path on the left-hand side of `+`, not `&impl A`
+type A = &dyn A + B;
+//~^ ERROR expected a path on the left-hand side of `+`, not `&dyn A`
+type A = &A + B;
+//~^ ERROR expected a path on the left-hand side of `+`, not `&A`
+
+fn main() {}
diff --git a/src/test/parse-fail/issue-24780.rs b/src/test/parse-fail/issue-24780.rs
index 56b91699478..6fd4ee38a4d 100644
--- a/src/test/parse-fail/issue-24780.rs
+++ b/src/test/parse-fail/issue-24780.rs
@@ -15,6 +15,6 @@
 // compile-flags: -Z parse-only
 
 fn foo() -> Vec<usize>> {
-    //~^ ERROR expected one of `!`, `::`, `where`, or `{`, found `>`
+    //~^ ERROR expected one of `!`, `+`, `::`, `where`, or `{`, found `>`
     Vec::new()
 }