nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-26 14:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1757 from topecongiro/rfc/combine-array

Browse Source 
Rfc: Combine Array
This commit is contained in:
Nick Cameron 2017-07-04 18:22:32 +12:00 committed by GitHub
commit 2400f39f98
4 changed files with 38 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/expr.rs
View File

@ -2404,9 +2404,10 @@ pub fn can_be_overflowed_expr(context: &RewriteContext, expr: &ast::Expr, args_l
context.use_block_indent() ||
context.config.fn_call_style() == IndentStyle::Visual && args_len > 1
}
ast::ExprKind::Array(..) |
ast::ExprKind::Call(..) |
ast::ExprKind::MethodCall(..) |
ast::ExprKind::Mac(..) |
ast::ExprKind::MethodCall(..) |
ast::ExprKind::Struct(..) |
ast::ExprKind::Tup(..) => context.use_block_indent() && args_len == 1,
ast::ExprKind::AddrOf(_, ref expr) |

14
tests/target/expr-block.rs
View File

@ -96,14 +96,12 @@ fn arrays() {
1,
];
let a = WeightedChoice::new(
&mut [
Weighted { weight: x, item: 0 },
Weighted { weight: 1, item: 1 },
Weighted { weight: x, item: 2 },
Weighted { weight: 1, item: 3 },
],
);
let a = WeightedChoice::new(&mut [
Weighted { weight: x, item: 0 },
Weighted { weight: 1, item: 1 },
Weighted { weight: x, item: 2 },
Weighted { weight: 1, item: 3 },
]);
let z = [
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx,

38
tests/target/expr.rs
View File

@ -224,26 +224,24 @@ fn arrays() {
1,
];
let a = WeightedChoice::new(
&mut [
Weighted {
weightweight: x,
item: 0,
},
Weighted {
weightweight: 1,
item: 1,
},
Weighted {
weightweight: x,
item: 2,
},
Weighted {
weightweight: 1,
item: 3,
},
],
);
let a = WeightedChoice::new(&mut [
Weighted {
weightweight: x,
item: 0,
},
Weighted {
weightweight: 1,
item: 1,
},
Weighted {
weightweight: x,
item: 2,
},
Weighted {
weightweight: 1,
item: 3,
},
]);
let z = [
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx,

26
tests/target/tuple.rs
View File

@ -62,20 +62,18 @@ fn issue550() {
fn issue775() {
if indent {
let a = mk_object(
&[
("a".to_string(), Boolean(true)),
(
"b".to_string(),
Array(vec![
mk_object(
&[("c".to_string(), String("\x0c\r".to_string()))],
),
mk_object(&[("d".to_string(), String("".to_string()))]),
]),
),
],
);
let a = mk_object(&[
("a".to_string(), Boolean(true)),
(
"b".to_string(),
Array(vec![
mk_object(
&[("c".to_string(), String("\x0c\r".to_string()))],
),
mk_object(&[("d".to_string(), String("".to_string()))]),
]),
),
]);
}
}