---

yaml
---
r: 51319
b: refs/heads/incoming
c: 885d0d3
h: refs/heads/master
i:
  51317: 73b1a11
  51315: 61488b8
  51311: d935bfd
v: v3

Author: luqmana

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 666e1b463600841ae593a1468a837dc59bb7cab5
+refs/heads/incoming: 885d0d3d3369bef72590a4d5671c0de83e968dda
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/etc/vim/syntax/rust.vim

@@ -11,7 +11,7 @@ elseif exists("b:current_syntax")
 endif
 
 syn match     rustAssert      "\<assert\(\w\)*"
-syn keyword   rustKeyword     __asm__ as break
+syn keyword   rustKeyword     as break
 syn keyword   rustKeyword     copy do drop else extern
 syn keyword   rustKeyword     for if impl let log
 syn keyword   rustKeyword     loop match mod once priv pub pure

branches/incoming/src/libsyntax/parse/parser.rs

@@ -1184,14 +1184,6 @@ pub impl Parser {
                 }
             }
             hi = self.span.hi;
-        } else if self.eat_keyword(&~"__asm__") {
-            self.expect(&token::LPAREN);
-            let asm = self.parse_str();
-            self.expect(&token::COMMA);
-            let cons = self.parse_str();
-            ex = expr_inline_asm(asm, cons);
-            hi = self.span.hi;
-            self.expect(&token::RPAREN);
         } else if self.eat_keyword(&~"log") {
             self.expect(&token::LPAREN);
             let lvl = self.parse_expr();

branches/incoming/src/libsyntax/parse/token.rs

@@ -488,7 +488,6 @@ pub fn temporary_keyword_table() -> HashMap<~str, ()> {
 pub fn strict_keyword_table() -> HashMap<~str, ()> {
     let words = HashMap();
     let keys = ~[
-        ~"__asm__",
         ~"as", ~"assert",
         ~"break",
         ~"const", ~"copy",