auto merge of #10420 : sanxiyn/rust/path, r=cmr

Fix #10283.
This commit is contained in:
bors 2013-11-16 14:36:40 -08:00
commit b0e1318164
3 changed files with 16 additions and 5 deletions

View file

@ -207,7 +207,7 @@ mod tests {
#[test]
fn type_id_hash() {
let (a, b) = (TypeId::of::<uint>(), TypeId::of::<uint>::());
let (a, b) = (TypeId::of::<uint>(), TypeId::of::<uint>());
assert_eq!(a.hash(), b.hash());
}

View file

@ -1470,10 +1470,6 @@ impl Parser {
let mut segments = ~[];
loop {
// First, parse an identifier.
match *self.token {
token::IDENT(*) => {}
_ => break,
}
let identifier = self.parse_ident();
// Next, parse a colon and bounded type parameters, if applicable.

View file

@ -0,0 +1,15 @@
// Copyright 2013 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.
// http://phpsadness.com/sad/1
fn main() {
::; //~ ERROR expected ident, found `;`
}