about summary refs log tree commit diff
path: root/src/libsyntax/parse/parser.rs
diff options
context:
space:
mode:
authorTim Chevalier <chevalier@alum.wellesley.edu>2012-09-07 15:11:26 -0700
committerTim Chevalier <chevalier@alum.wellesley.edu>2012-09-07 17:22:04 -0700
commitf5093dff7b28a47309e3cafd2530663313ef56f0 (patch)
treecb577838e5daba3158f7177dbc51de6258ece757 /src/libsyntax/parse/parser.rs
parent62ab9d70f4ba1f35f0fc6d851318ac0966001229 (diff)
downloadrust-f5093dff7b28a47309e3cafd2530663313ef56f0.tar.gz
rust-f5093dff7b28a47309e3cafd2530663313ef56f0.zip
Remove support for multiple traits in a single impl
There was half-working support for them, but they were never fully
implemented or even approved. Remove them altogether.

Closes #3410
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
-rw-r--r--src/libsyntax/parse/parser.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index a21d9de7567..2377555dfb3 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -2571,11 +2571,11 @@ struct parser {
 
 
         // Parse traits, if necessary.
-        let traits = if self.token == token::COLON {
+        let opt_trait = if self.token == token::COLON {
             self.bump();
-            self.parse_trait_ref_list(token::LBRACE)
+            Some(self.parse_trait_ref())
         } else {
-            ~[]
+            None
         };
 
         let mut meths = ~[];
@@ -2584,7 +2584,7 @@ struct parser {
             let vis = self.parse_visibility();
             vec::push(meths, self.parse_method(vis));
         }
-        (ident, item_impl(tps, traits, ty, meths), None)
+        (ident, item_impl(tps, opt_trait, ty, meths), None)
     }
 
     // Instantiates ident <i> with references to <typarams> as arguments.