Skip to content

Commit 7f500ab

Browse files
committed
Keep everything tidy.
1 parent 5aa734d commit 7f500ab

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2303,7 +2303,7 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt,
23032303
let region_lb = ty::re_scope(expr.id);
23042304
instantiate_path(fcx, pth, tpt, expr.span, expr.id, region_lb);
23052305
}
2306-
ast::expr_inline_asm(*) => {
2306+
ast::expr_inline_asm(*) => {
23072307
fcx.require_unsafe(expr.span, ~"use of inline assembly");
23082308
fcx.write_nil(id);
23092309
}

src/libsyntax/ast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ pub enum expr_ {
600600
expr_again(Option<ident>),
601601
expr_ret(Option<@expr>),
602602
expr_log(log_level, @expr, @expr),
603-
603+
604604
/* asm, clobbers + constraints, volatile */
605605
expr_inline_asm(@~str, @~str, bool),
606606

src/libsyntax/ext/asm.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ pub fn expand_asm(cx: ext_ctxt, sp: span, tts: &[ast::token_tree])
5555

5656
let mut state = Asm;
5757
loop outer: {
58-
5958
match state {
6059
Asm => {
6160
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])
6564
while *p.token != token::EOF &&
6665
*p.token != token::COLON &&
6766
*p.token != token::MOD_SEP {
68-
67+
6968
if outputs.len() != 0 {
7069
p.eat(&token::COMMA);
7170
}
72-
71+
7372
let constraint = p.parse_str();
7473
p.expect(&token::LPAREN);
7574
let out = p.parse_expr();
@@ -82,11 +81,11 @@ pub fn expand_asm(cx: ext_ctxt, sp: span, tts: &[ast::token_tree])
8281
while *p.token != token::EOF &&
8382
*p.token != token::COLON &&
8483
*p.token != token::MOD_SEP {
85-
84+
8685
if inputs.len() != 0 {
8786
p.eat(&token::COMMA);
8887
}
89-
88+
9089
let constraint = p.parse_str();
9190
p.expect(&token::LPAREN);
9291
let in = p.parse_expr();
@@ -100,11 +99,11 @@ pub fn expand_asm(cx: ext_ctxt, sp: span, tts: &[ast::token_tree])
10099
while *p.token != token::EOF &&
101100
*p.token != token::COLON &&
102101
*p.token != token::MOD_SEP {
103-
102+
104103
if clobs.len() != 0 {
105104
p.eat(&token::COMMA);
106105
}
107-
106+
108107
let clob = ~"~{" + *p.parse_str() + ~"}";
109108
clobs.push(clob);
110109
}
@@ -113,7 +112,7 @@ pub fn expand_asm(cx: ext_ctxt, sp: span, tts: &[ast::token_tree])
113112
}
114113
Options => {
115114
let option = *p.parse_str();
116-
115+
117116
if option == ~"volatile" {
118117
volatile = true;
119118
}
@@ -146,7 +145,7 @@ pub fn expand_asm(cx: ext_ctxt, sp: span, tts: &[ast::token_tree])
146145
} else if *p.token == token::EOF {
147146
break outer;
148147
} else {
149-
state
148+
state
150149
};
151150
}
152151
}

0 commit comments

Comments
 (0)