---

yaml
---
r: 138948
b: refs/heads/try2
c: 7f500ab
h: refs/heads/master
v: v3

Author: luqmana

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 5aa734d6a1946e526832bb602e1bb271bf26c0b1
+refs/heads/try2: 7f500ab4c1303723192952f9ae1f09290bc1fe1e
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/typeck/check/mod.rs

@@ -2303,7 +2303,7 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt,
         let region_lb = ty::re_scope(expr.id);
         instantiate_path(fcx, pth, tpt, expr.span, expr.id, region_lb);
       }
-      ast::expr_inline_asm(*) => { 
+      ast::expr_inline_asm(*) => {
           fcx.require_unsafe(expr.span, ~"use of inline assembly");
           fcx.write_nil(id);
       }

branches/try2/src/libsyntax/ast.rs

@@ -600,7 +600,7 @@ pub enum expr_ {
     expr_again(Option<ident>),
     expr_ret(Option<@expr>),
     expr_log(log_level, @expr, @expr),
-    
+
     /* asm, clobbers + constraints, volatile */
     expr_inline_asm(@~str, @~str, bool),
 

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

@@ -55,7 +55,6 @@ pub fn expand_asm(cx: ext_ctxt, sp: span, tts: &[ast::token_tree])
 
     let mut state = Asm;
     loop outer: {
-        
         match state {
             Asm => {
                 asm = expr_to_str(cx, p.parse_expr(),
@@ -65,11 +64,11 @@ pub fn expand_asm(cx: ext_ctxt, sp: span, tts: &[ast::token_tree])
                 while *p.token != token::EOF &&
                       *p.token != token::COLON &&
                       *p.token != token::MOD_SEP {
-                    
+
                     if outputs.len() != 0 {
                         p.eat(&token::COMMA);
                     }
-                    
+
                     let constraint = p.parse_str();
                     p.expect(&token::LPAREN);
                     let out = p.parse_expr();
@@ -82,11 +81,11 @@ pub fn expand_asm(cx: ext_ctxt, sp: span, tts: &[ast::token_tree])
                 while *p.token != token::EOF &&
                       *p.token != token::COLON &&
                       *p.token != token::MOD_SEP {
-                    
+
                     if inputs.len() != 0 {
                         p.eat(&token::COMMA);
                     }
-                    
+
                     let constraint = p.parse_str();
                     p.expect(&token::LPAREN);
                     let in = p.parse_expr();
@@ -100,11 +99,11 @@ pub fn expand_asm(cx: ext_ctxt, sp: span, tts: &[ast::token_tree])
                 while *p.token != token::EOF &&
                       *p.token != token::COLON &&
                       *p.token != token::MOD_SEP {
-                    
+
                     if clobs.len() != 0 {
                         p.eat(&token::COMMA);
                     }
-                    
+
                     let clob = ~"~{" + *p.parse_str() + ~"}";
                     clobs.push(clob);
                 }
@@ -113,7 +112,7 @@ pub fn expand_asm(cx: ext_ctxt, sp: span, tts: &[ast::token_tree])
             }
             Options => {
                 let option = *p.parse_str();
-                
+
                 if option == ~"volatile" {
                     volatile = true;
                 }
@@ -146,7 +145,7 @@ pub fn expand_asm(cx: ext_ctxt, sp: span, tts: &[ast::token_tree])
             } else if *p.token == token::EOF {
                 break outer;
             } else {
-               state 
+               state
             };
         }
     }