mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check length of break and continue expressions

Browse Source
This commit is contained in:
Marcus Klaas 2016-04-15 18:11:20 +02:00
parent 847bad603e
commit d98e22c971
3 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/expr.rs
View File

@ -137,14 +137,14 @@ fn rewrite(&self, context: &RewriteContext, width: usize, offset: Indent) -> Opt
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)

20
tests/source/issue-855.rs Normal file
View File

@ -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
tests/target/issue-855.rs Normal file
View File

@ -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
}
}
}
}
}