From 5fbdf3ccd0407533d7da95c2bd3c33944c71f1b0 Mon Sep 17 00:00:00 2001
From: Nick Cameron <ncameron@mozilla.com>
Date: Tue, 8 Sep 2015 16:09:28 +1200
Subject: [PATCH] Fix span bug with >> and type bindings

---
 src/libsyntax/parse/parser.rs            |  2 +-
 src/test/compile-fail/ty_binding_span.rs | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 src/test/compile-fail/ty_binding_span.rs

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 1985c91c9219..7ce936ed165b 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -3964,7 +3964,7 @@ impl<'a> Parser<'a> {
                     p.span_warn(span, "whoops, no =?");
                 }
                 let ty = try!(p.parse_ty_nopanic());
-                let hi = p.span.hi;
+                let hi = ty.span.hi;
                 let span = mk_sp(lo, hi);
                 return Ok(P(TypeBinding{id: ast::DUMMY_NODE_ID,
                     ident: ident,
diff --git a/src/test/compile-fail/ty_binding_span.rs b/src/test/compile-fail/ty_binding_span.rs
new file mode 100644
index 000000000000..dd56ce5b3dd7
--- /dev/null
+++ b/src/test/compile-fail/ty_binding_span.rs
@@ -0,0 +1,20 @@
+// Copyright 2012 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.
+
+// Test the type binding span doesn't include >>
+
+use std::ops::Deref;
+
+fn homura<T: Deref<Trget=i32 //~ ERROR associated type
+>>(_: T) { }
+
+
+fn main() {
+}