Skip to content

Commit b0e1318

Browse files
committed
auto merge of #10420 : sanxiyn/rust/path, r=cmr
Fix #10283.
2 parents 90754ae + 2337d88 commit b0e1318

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

Diff for: src/libstd/any.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ mod tests {
207207

208208
#[test]
209209
fn type_id_hash() {
210-
let (a, b) = (TypeId::of::<uint>(), TypeId::of::<uint>::());
210+
let (a, b) = (TypeId::of::<uint>(), TypeId::of::<uint>());
211211

212212
assert_eq!(a.hash(), b.hash());
213213
}

Diff for: src/libsyntax/parse/parser.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1470,10 +1470,6 @@ impl Parser {
14701470
let mut segments = ~[];
14711471
loop {
14721472
// First, parse an identifier.
1473-
match *self.token {
1474-
token::IDENT(*) => {}
1475-
_ => break,
1476-
}
14771473
let identifier = self.parse_ident();
14781474

14791475
// Next, parse a colon and bounded type parameters, if applicable.

Diff for: src/test/compile-fail/paamayim-nekudotayim.rs

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// http://phpsadness.com/sad/1
12+
13+
fn main() {
14+
::; //~ ERROR expected ident, found `;`
15+
}

0 commit comments

Comments
 (0)