Auto merge of #28291 - nrc:shr_span_fix, r=sfackler

This commit is contained in:
bors 2015-09-08 04:45:37 +00:00
commit a7d63fdbd0
2 changed files with 21 additions and 1 deletions

View File

@ -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,

View File

@ -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() {
}