---

yaml
---
r: 36599
b: refs/heads/try2
c: 7e98720
h: refs/heads/master
i:
  36597: 4cf8eed
  36595: 04e64cf
  36591: d3e9556
v: v3

Author: graydon

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: d45cb279012a56faaa39de305c1f8cd2098ecfb0
+refs/heads/try2: 7e9872058e4d7f4dfa5824c441b02094bdd883b5
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libsyntax/ext/base.rs

@@ -123,8 +123,8 @@ fn syntax_expander_table() -> HashMap<~str, syntax_extension> {
         ~"quote_tokens", builtin_normal_tt(ext::quote::expand_quote_tokens));
     syntax_expanders.insert(~"quote_expr",
                             builtin_normal_tt(ext::quote::expand_quote_expr));
-    syntax_expanders.insert(~"quote_type",
-                            builtin_normal_tt(ext::quote::expand_quote_type));
+    syntax_expanders.insert(~"quote_ty",
+                            builtin_normal_tt(ext::quote::expand_quote_ty));
     syntax_expanders.insert(~"quote_item",
                             builtin_normal_tt(ext::quote::expand_quote_item));
     syntax_expanders.insert(~"quote_pat",

branches/try2/src/libsyntax/ext/quote.rs

@@ -62,11 +62,11 @@ pub fn expand_quote_pat(cx: ext_ctxt,
                                     ~[e_refutable], tts))
 }
 
-pub fn expand_quote_type(cx: ext_ctxt,
-                         sp: span,
-                         tts: ~[ast::token_tree]) -> base::mac_result {
+pub fn expand_quote_ty(cx: ext_ctxt,
+                       sp: span,
+                       tts: ~[ast::token_tree]) -> base::mac_result {
     let e_param_colons = build::mk_lit(cx, sp, ast::lit_bool(false));
-    base::mr_expr(expand_parse_call(cx, sp, ~"parse_type",
+    base::mr_expr(expand_parse_call(cx, sp, ~"parse_ty",
                                     ~[e_param_colons], tts))
 }