Rollup merge of rust-lang#55254 - rust-lang:clean-two-dots, r=GuillaumeGomez

kennytm · web-flow · commit 5b225031e80a · 2018-10-25T01:27:13.000+08:00
Correct trailing ellipsis in name_from_pat r? @GuillaumeGomez
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
@@ -3632,7 +3632,7 @@ fn name_from_pat(p: &hir::Pat) -> String {
                 fields.iter().map(|&Spanned { node: ref fp, .. }|
                                   format!("{}: {}", fp.ident, name_from_pat(&*fp.pat)))
                              .collect::<Vec<String>>().join(", "),
-                if etc { ", ..." } else { "" }
+                if etc { ", .." } else { "" }
             )
         }
         PatKind::Tuple(ref elts, _) => format!("({})", elts.iter().map(|p| name_from_pat(&**p))

Original file line number	Diff line number	Diff line change
`@@ -3632,7 +3632,7 @@ fn name_from_pat(p: &hir::Pat) -> String {`
`3632`	`3632`	`fields.iter().map(\|&Spanned { node: ref fp, .. }\|`
`3633`	`3633`	`format!("{}: {}", fp.ident, name_from_pat(&*fp.pat)))`
`3634`	`3634`	`.collect::<Vec<String>>().join(", "),`
`3635`		`- if etc { ", ..." } else { "" }`
	`3635`	`+ if etc { ", .." } else { "" }`
`3636`	`3636`	`)`
`3637`	`3637`	`}`
`3638`	`3638`	`PatKind::Tuple(ref elts, _) => format!("({})", elts.iter().map(\|p\| name_from_pat(&**p))`