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

Fix #10283.

3 files changed, 16 insertions, 5 deletions

diff --git a/src/libstd/any.rs b/src/libstd/any.rs
index 76996c0dede..e02bf9f4ba8 100644
--- a/src/libstd/any.rs
+++ b/src/libstd/any.rs
@@ -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());
     }
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index cfb4da87720..ad5da0b9289 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -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.
diff --git a/src/test/compile-fail/paamayim-nekudotayim.rs b/src/test/compile-fail/paamayim-nekudotayim.rs
new file mode 100644
index 00000000000..4d5473faf73
--- /dev/null
+++ b/src/test/compile-fail/paamayim-nekudotayim.rs
@@ -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 `;`
+}