nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-12 20:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add extra tests for match arm placement

Browse Source
This commit is contained in:
Marcus Klaas 2015-09-27 11:58:26 +02:00
parent 2d4a0cbe3b
commit 2eb67827a7
3 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/expr.rs
View File

@ -918,16 +918,13 @@ impl Rewrite for ast::Arm {
.block_indent(context.config)),
body_budget);
let (body_str, break_line) = try_opt!(match_arm_heuristic(same_line_body.as_ref()
.map(|x| &x[..]),
next_line_body.as_ref()
.map(|x| &x[..])));
let body_str = try_opt!(match_arm_heuristic(same_line_body.as_ref().map(|x| &x[..]),
next_line_body.as_ref().map(|x| &x[..])));
let spacer = if break_line {
format!("\n{}",
offset.block_indent(context.config).to_string(context.config))
} else {
" ".to_owned()
let spacer = match same_line_body {
Some(ref body) if body == body_str => " ".to_owned(),
_ => format!("\n{}",
offset.block_indent(context.config).to_string(context.config)),
};
Some(format!("{}{} =>{}{},",
@ -939,17 +936,14 @@ impl Rewrite for ast::Arm {
}
// Takes two possible rewrites for the match arm body and chooses the "nicest".
// Bool marks break line or no.
fn match_arm_heuristic<'a>(former: Option<&'a str>,
latter: Option<&'a str>)
-> Option<(&'a str, bool)> {
fn match_arm_heuristic<'a>(former: Option<&'a str>, latter: Option<&'a str>) -> Option<&'a str> {
match (former, latter) {
(Some(f), None) => Some((f, false)),
(f @ Some(..), None) => f,
(Some(f), Some(l)) if f.chars().filter(|&c| c == '\n').count() <=
l.chars().filter(|&c| c == '\n').count() => {
Some((f, false))
Some(f)
}
(_, l) => l.map(|s| (s, true)),
(_, l) => l,
}
}

12
tests/source/match.rs
View File

@ -209,3 +209,15 @@ fn issue355() {
dddddddddd),
}
}
fn issue280() {
{
match x {
CompressionMode::DiscardNewline | CompressionMode::CompressWhitespaceNewline => ch ==
'\n',
ast::ItemConst(ref typ, ref expr) => self.process_static_or_const_item(item,
&typ,
&expr),
}
}
}

11
tests/target/match.rs
View File

@ -199,3 +199,14 @@ fn issue355() {
dddddddddd),
}
}
fn issue280() {
{
match x {
CompressionMode::DiscardNewline | CompressionMode::CompressWhitespaceNewline =>
ch == '\n',
ast::ItemConst(ref typ, ref expr) =>
self.process_static_or_const_item(item, &typ, &expr),
}
}
}