diff options
| author | Nick Cameron <nrc@ncameron.org> | 2017-05-01 15:48:53 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-01 15:48:53 +1200 |
| commit | fba5af2a7d5efa2a324b52fd80648a04d6fabb3d (patch) | |
| tree | 2501011a3d42eb6a1c1341ef9438cf8cf97a7f95 /src/patterns.rs | |
| parent | a8fbfdb4a3f3c0917e2d6a2dade42ec3f1580ca2 (diff) | |
| parent | 02cf515be63600c1a2f59ba4ce77695e1ef60ceb (diff) | |
Merge pull request #1469 from topecongiro/bug/chains
Remove a bug when calculating the length of the chain
Diffstat (limited to 'src/patterns.rs')
| -rw-r--r-- | src/patterns.rs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/patterns.rs b/src/patterns.rs index 1ed13ab70b6..a50fee040d6 100644 --- a/src/patterns.rs +++ b/src/patterns.rs @@ -102,10 +102,8 @@ impl Rewrite for Pat { let suffix = suffix.iter().map(|p| p.rewrite(context, shape)); // Munge them together. - let pats: Option<Vec<String>> = prefix - .chain(slice_pat.into_iter()) - .chain(suffix) - .collect(); + let pats: Option<Vec<String>> = + prefix.chain(slice_pat.into_iter()).chain(suffix).collect(); // Check that all the rewrites succeeded, and if not return None. let pats = try_opt!(pats); @@ -244,9 +242,7 @@ fn rewrite_tuple_pat(pats: &[ptr::P<ast::Pat>], context: &RewriteContext, shape: Shape) -> Option<String> { - let mut pat_vec: Vec<_> = pats.into_iter() - .map(|x| TuplePatField::Pat(x)) - .collect(); + let mut pat_vec: Vec<_> = pats.into_iter().map(|x| TuplePatField::Pat(x)).collect(); if let Some(pos) = dotdot_pos { let prev = if pos == 0 { |
