---

yaml
---
r: 44730
b: refs/heads/master
c: f396582
h: refs/heads/master
v: v3

Author: erickt

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 4650da5888427b60c6d38308bcdd76da40f1b181
+refs/heads/master: f3965829ffd1e2eb4e2b8c4c8f151379f504ed7f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/src/libsyntax/parse/parser.rs

@@ -1228,7 +1228,7 @@ pub impl Parser {
                   _ => self.fatal(~"expected open delimiter")
                 };
 
-                let ket = token::flip_delimiter(*self.token);
+                let ket = token::flip_delimiter(&*self.token);
                 let tts = self.parse_unspanned_seq(*self.token,
                                                    ket,
                                                    seq_sep_none(),
@@ -1433,7 +1433,7 @@ pub impl Parser {
           }
           token::LPAREN | token::LBRACE | token::LBRACKET => {
               // tjc: ??????
-            let ket = token::flip_delimiter(*self.token);
+            let ket = token::flip_delimiter(&*self.token);
             tt_delim(vec::append(
                 // the open delimiter:
                 ~[parse_any_tt_tok(self)],
@@ -1465,7 +1465,7 @@ pub impl Parser {
           token::LBRACE | token::LPAREN | token::LBRACKET => {
             self.parse_matcher_subseq(name_idx, *self.token,
                                       // tjc: not sure why we need a copy
-                                      token::flip_delimiter(*self.token))
+                                      token::flip_delimiter(&*self.token))
           }
           _ => self.fatal(~"expected open delimiter")
         }
@@ -3915,7 +3915,7 @@ pub impl Parser {
             // eat a matched-delimiter token tree:
             let tts = match *self.token {
               token::LPAREN | token::LBRACE => {
-                let ket = token::flip_delimiter(*self.token);
+                let ket = token::flip_delimiter(&*self.token);
                 self.parse_unspanned_seq(*self.token, ket,
                                          seq_sep_none(),
                                          |p| p.parse_token_tree())

trunk/src/libsyntax/parse/token.rs

@@ -257,8 +257,8 @@ pub pure fn can_begin_expr(t: Token) -> bool {
 }
 
 /// what's the opposite delimiter?
-pub fn flip_delimiter(t: token::Token) -> token::Token {
-    match t {
+pub fn flip_delimiter(t: &token::Token) -> token::Token {
+    match *t {
       token::LPAREN => token::RPAREN,
       token::LBRACE => token::RBRACE,
       token::LBRACKET => token::RBRACKET,