---

yaml
---
r: 15435
b: refs/heads/try
c: aeca5ba
h: refs/heads/master
i:
  15433: 7eb2b74
  15431: 2c26894
v: v3

Author: graydon

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 7a3b29024548e1dcb13590002d5cf4dd94ddd4d4
+refs/heads/try: aeca5bae90cdb0654073babf8799e97675c9bec0
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/librustsyntax/parse/parser.rs

@@ -392,7 +392,7 @@ fn parse_ty_postfix(orig_t: ast::ty_, p: parser, colons_before_params: bool,
 
     if p.token == token::BINOP(token::SLASH) {
         let orig_hi = p.last_span.hi;
-        alt parse_maybe_vstore(p) {
+        alt maybe_parse_vstore(p) {
           none { }
           some(v) {
             let t = ast::ty_vstore(mk_ty(p, orig_t, lo, orig_hi), v);
@@ -693,7 +693,7 @@ fn have_dollar(p: parser) -> option<ast::mac_> {
     }
 }
 
-fn parse_maybe_vstore(p: parser) -> option<ast::vstore> {
+fn maybe_parse_vstore(p: parser) -> option<ast::vstore> {
     if p.token == token::BINOP(token::SLASH) {
         p.bump();
         alt p.token {
@@ -1060,7 +1060,7 @@ fn parse_bottom_expr(p: parser) -> pexpr {
     alt ex {
       ast::expr_lit(@{node: ast::lit_str(_), span: _}) |
       ast::expr_vec(_, _)  {
-        alt parse_maybe_vstore(p) {
+        alt maybe_parse_vstore(p) {
           none { }
           some(v) {
             hi = p.span.hi;