Skip to content

Commit

Permalink
Check length of break and continue expressions
Browse files Browse the repository at this point in the history
  • Loading branch information
marcusklaas committed Apr 15, 2016
1 parent 847bad6 commit d98e22c
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/expr.rs
Expand Up @@ -137,14 +137,14 @@ impl Rewrite for ast::Expr {
Some(ident) => format!(" {}", ident.node),
None => String::new(),
};
Some(format!("continue{}", id_str))
wrap_str(format!("continue{}", id_str), context.config.max_width, width, offset)
}
ast::ExprKind::Break(ref opt_ident) => {
let id_str = match *opt_ident {
Some(ident) => format!(" {}", ident.node),
None => String::new(),
};
Some(format!("break{}", id_str))
wrap_str(format!("break{}", id_str), context.config.max_width, width, offset)
}
ast::ExprKind::Closure(capture, ref fn_decl, ref body) => {
rewrite_closure(capture, fn_decl, body, self.span, context, width, offset)
Expand Down
20 changes: 20 additions & 0 deletions tests/source/issue-855.rs
@@ -0,0 +1,20 @@
fn main() {
'running: loop {
for event in event_pump.poll_iter() {
match event {
Event::Quit {..} | Event::KeyDown { keycode: Some(Keycode::Escape), .. } => break 'running,
}
}
}
}

fn main2() {
'running: loop {
for event in event_pump.poll_iter() {
match event {
Event::Quit {..} |
Event::KeyDownXXXXXXXXXXXXX { keycode: Some(Keycode::Escape), .. } => break 'running,
}
}
}
}
23 changes: 23 additions & 0 deletions tests/target/issue-855.rs
@@ -0,0 +1,23 @@
fn main() {
'running: loop {
for event in event_pump.poll_iter() {
match event {
Event::Quit { .. } |
Event::KeyDown { keycode: Some(Keycode::Escape), .. } => break 'running,
}
}
}
}

fn main2() {
'running: loop {
for event in event_pump.poll_iter() {
match event {
Event::Quit { .. } |
Event::KeyDownXXXXXXXXXXXXX { keycode: Some(Keycode::Escape), .. } => {
break 'running
}
}
}
}
}

0 comments on commit d98e22c

Please sign in to comment.