nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-06 21:53:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Factor out a mess

Browse Source
This commit is contained in:
topecongiro 2017-12-01 13:44:40 +09:00 committed by Seiichi Uchida
parent 16184d3e16
commit 27a540db47
1 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/expr.rs
View File

@ -2042,42 +2042,27 @@ where
tactic = DefinitiveListTactic::Horizontal;
} else {
tactic = default_tactic();
let is_simple_enough =
tactic == DefinitiveListTactic::Vertical && is_every_args_simple(args);
if is_simple_enough
&& FORMAT_LIKE_WHITELIST
.iter()
.find(|s| **s == callee_str)
.is_some()
{
// For special-case macros, we may want to use different tactics.
let maybe_args_offset = maybe_get_args_offset(callee_str, args);
if tactic == DefinitiveListTactic::Vertical && maybe_args_offset.is_some() {
let args_offset = maybe_args_offset.unwrap();
let args_tactic = definitive_tactic(
&item_vec[1..],
&item_vec[args_offset..],
ListTactic::HorizontalVertical,
Separator::Comma,
nested_shape.width,
);
tactic = if args_tactic == DefinitiveListTactic::Horizontal {
DefinitiveListTactic::FormatCall
} else {
default_tactic()
};
} else if is_simple_enough && item_vec.len() >= 2
&& WRITE_LIKE_WHITELIST
.iter()
.find(|s| **s == callee_str)
.is_some()
{
let args_tactic = definitive_tactic(
&item_vec[2..],
ListTactic::HorizontalVertical,
Separator::Comma,
nested_shape.width,
);
tactic = if args_tactic == DefinitiveListTactic::Horizontal {
DefinitiveListTactic::WriteCall
} else {
default_tactic()
};
// Every argument is simple and fits on a single line.
if args_tactic == DefinitiveListTactic::Horizontal {
tactic = if args_offset == 1 {
DefinitiveListTactic::FormatCall
} else {
DefinitiveListTactic::WriteCall
};
}
}
}
}
@ -2111,6 +2096,29 @@ fn is_every_args_simple<T: ToExpr>(lists: &[&T]) -> bool {
.all(|arg| arg.to_expr().map_or(false, is_simple_arg))
}
/// In case special-case style is required, returns an offset from which we start horizontal layout.
fn maybe_get_args_offset<T: ToExpr>(callee_str: &str, args: &[&T]) -> Option<usize> {
if FORMAT_LIKE_WHITELIST
.iter()
.find(|s| **s == callee_str)
.is_some()
&& args.len() >= 1
&& is_every_args_simple(args)
{
Some(1)
} else if WRITE_LIKE_WHITELIST
.iter()
.find(|s| **s == callee_str)
.is_some()
&& args.len() >= 2
&& is_every_args_simple(args)
{
Some(2)
} else {
None
}
}
/// Returns a shape for the last argument which is going to be overflowed.
fn last_arg_shape<T>(
lists: &[&T],