]> git.lizzy.rs Git - rust.git/commitdiff
Keep everything tidy.
authorLuqman Aden <me@luqman.ca>
Tue, 12 Mar 2013 07:09:53 +0000 (00:09 -0700)
committerLuqman Aden <me@luqman.ca>
Tue, 12 Mar 2013 08:03:34 +0000 (01:03 -0700)
src/librustc/middle/typeck/check/mod.rs
src/libsyntax/ast.rs
src/libsyntax/ext/asm.rs

index e59dc1398a04e39fb3f27a08dba6c24367e73122..445cab4ba95fd4b94e9f21880551f24a8cdeb0f7 100644 (file)
@@ -2303,7 +2303,7 @@ fn check_loop_body(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);
       }
index dab5de47aa648d4753a0434290de2559d0158c3e..7b4b382393f6ce794181a36723bcc1be95cf6df4 100644 (file)
@@ -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),
 
index 229d1d2a95e1f7a0c0bbb97b799d28b7de3eba65..3f1aea59ab502439ab6131c6e19335b412564d3a 100644 (file)
@@ -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
             };
         }
     }