---

yaml
---
r: 31704
b: refs/heads/dist-snap
c: 92ef17a
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 2772b2e5c7f85e230bcae13c49eb1386afc6cd0e
+refs/heads/dist-snap: 92ef17aaebb28a8fe6579f669a3ee162c931d9dd
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libsyntax/parse/parser.rs

@@ -2436,7 +2436,8 @@ class parser {
                 !self.token_is_keyword(~"of", self.look_ahead(1)) &&
                 !self.token_is_keyword(~"for", self.look_ahead(1)) &&
                 self.look_ahead(1) != token::BINOP(token::SLASH) &&
-                self.look_ahead(1) != token::LT {
+                (self.look_ahead(1) != token::LT
+                 || (self.look_ahead(1) == token::LT && tps.is_not_empty())) {
 
             // This is a new-style impl declaration.
             ident = @~"__extensions__";     // XXX: clownshoes

branches/dist-snap/src/test/run-pass/impl-implicit-trait.rs

@@ -0,0 +1,20 @@
+enum option_<T> {
+    none_,
+    some_(T),
+}
+
+impl<T> option_<T> {
+    fn foo() -> bool { true }
+}
+
+enum option__ {
+    none__,
+    some__(int)
+}
+
+impl option__ {
+    fn foo() -> bool { true }
+}
+
+fn main() {
+}