squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Use block indent style for struct tuple

Browse source
This commit is contained in:
topecongiro 2017-06-24 01:12:58 +09:00
parent 818ff7a602
commit 332cc97986
4 changed files with 45 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/items.rs
View file

@ -15,8 +15,8 @@ use codemap::SpanUtils;
use utils::{format_mutability, format_visibility, contains_skip, end_typaram, wrap_str,
last_line_width, format_unsafety, trim_newlines, stmt_expr, semicolon_for_expr,
trimmed_last_line_width, colon_spaces, mk_sp};
use lists::{write_list, itemize_list, ListItem, ListFormatting, SeparatorTactic, list_helper,
DefinitiveListTactic, ListTactic, definitive_tactic};
use lists::{write_list, itemize_list, definitive_tactic, ListItem, ListFormatting,
SeparatorTactic, DefinitiveListTactic, ListTactic};
use expr::{format_expr, is_empty_block, is_simple_block_stmt, rewrite_assign_rhs, ExprType};
use comment::{FindUncommented, contains_comment, rewrite_comment, recover_comment_removed};
use visitor::FmtVisitor;
@ -1152,12 +1152,11 @@ fn format_tuple_struct(
let generics_str = try_opt!(rewrite_generics(context, generics, shape, g_span));
result.push_str(&generics_str);
let where_budget = try_opt!(
context
.config
.max_width()
.checked_sub(last_line_width(&result))
);
let where_budget = context
.config
.max_width()
.checked_sub(last_line_width(&result))
.unwrap_or(0);
try_opt!(rewrite_where_clause(
context,
&generics.where_clause,
@ -1197,7 +1196,11 @@ fn format_tuple_struct(
}
IndentStyle::Block => {
(
ListTactic::HorizontalVertical,
if result.contains('\n') {
ListTactic::Vertical
} else {
ListTactic::HorizontalVertical
},
offset.block_only().block_indent(&context.config),
)
}
@ -1233,15 +1236,20 @@ fn format_tuple_struct(
context
.config
.max_width()
.checked_sub(offset.block_only().width() + result.len() + 3)
.checked_sub(offset.block_only().width() + last_line_width(&result) + 3)
);
let body = try_opt!(list_helper(
items,
// TODO budget is wrong in block case
Shape::legacy(body_budget, item_indent),
context.config,
tactic,
));
let item_vec: Vec<_> = items.collect();
let tactic = definitive_tactic(&item_vec, tactic, body_budget);
let fmt = ListFormatting {
tactic: tactic,
separator: ",",
trailing_separator: context.config.trailing_comma(),
shape: Shape::indented(item_indent, context.config),
ends_with_newline: false,
config: context.config,
};
let body = try_opt!(write_list(&item_vec, &fmt));
if context.config.fn_args_layout() == IndentStyle::Visual || !body.contains('\n') {
result.push('(');

8
tests/target/enum.rs
View file

@ -32,7 +32,7 @@ enum Bar {
enum LongVariants {
First(
LOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG, // comment
VARIANT
VARIANT,
),
// This is the second variant
Second,
@ -53,7 +53,7 @@ enum X {
CreateWebGLPaintTask(
Size2D<i32>,
GLContextAttributes,
IpcSender<Result<(IpcSender<CanvasMsg>, usize), String>>
IpcSender<Result<(IpcSender<CanvasMsg>, usize), String>>,
), // This is a post comment
}
@ -120,7 +120,7 @@ fn nested_enum_test() {
usize,
usize,
usize,
usize
usize,
), /* AAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAA
* AAAAAAAAAAAAAAAAAAAAAA */
Two, /* AAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@ -155,6 +155,6 @@ pub enum CoreResourceMsg {
#[serde(deserialize_with = "::hyper_serde::deserialize",
serialize_with = "::hyper_serde::serialize")]
Cookie,
CookieSource
CookieSource,
),
}

23
tests/target/structs.rs
View file

@ -43,12 +43,13 @@ struct NewType(Type, OtherType);
struct NewInt<T: Copy>(pub i32, SomeType /* inline comment */, T /* sup */);
struct Qux<'a,
N: Clone + 'a,
E: Clone + 'a,
G: Labeller<'a, N, E> + GraphWalk<'a, N, E>,
W: Write + Copy>
(
struct Qux<
'a,
N: Clone + 'a,
E: Clone + 'a,
G: Labeller<'a, N, E> + GraphWalk<'a, N, E>,
W: Write + Copy,
>(
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA, // Comment
BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB,
#[AnAttr]
@ -62,7 +63,7 @@ struct Tuple(
// Comment 1
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,
// Comment 2
BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB,
);
// With a where clause and generics.
@ -154,7 +155,7 @@ struct Foo<T>(
TTTTTTTTTTTTTTTTT,
UUUUUUUUUUUUUUUUUUUUUUUU,
TTTTTTTTTTTTTTTTTTT,
UUUUUUUUUUUUUUUUUUU
UUUUUUUUUUUUUUUUUUU,
);
struct Foo<T>(TTTTTTTTTTTTTTTTTT, UUUUUUUUUUUUUUUUUUUUUUUU, TTTTTTTTTTTTTTTTTTT)
where
@ -166,7 +167,7 @@ struct Foo<T>(
TTTTTTTTTTTTTTTTT,
UUUUUUUUUUUUUUUUUUUUUUUU,
TTTTTTTTTTTTTTTTTTT,
UUUUUUUUUUUUUUUUUUU
UUUUUUUUUUUUUUUUUUU,
)
where
T: PartialEq;
@ -176,7 +177,7 @@ struct Foo<T>(
// Baz
TTTTTTTTTTTTTTTTTTT,
// Qux (FIXME #572 - doc comment)
UUUUUUUUUUUUUUUUUUU
UUUUUUUUUUUUUUUUUUU,
);
mod m {
@ -191,7 +192,7 @@ mod m {
struct Foo<T>(
TTTTTTTTTTTTTTTTTTT,
/// Qux
UUUUUUUUUUUUUUUUUUU
UUUUUUUUUUUUUUUUUUU,
);
struct Issue677 {

5
tests/target/trailing_commas.rs
View file

@ -48,7 +48,10 @@ struct Pair<
struct TupPair<
S, T,
>(S, T)
>(
S,
T,
)
where
T: P,
S: P + Q;