Fix missing parentheses Fn notation error

2020-05-27 18:31:22 +02:00 · 2020-05-27 18:31:22 +02:00 · 5a813b6dd6
commit 5a813b6dd6
parent 74e8046834
1 changed files with 9 additions and 2 deletions
--- a/src/librustc_typeck/astconv.rs
+++ b/src/librustc_typeck/astconv.rs
@ -1151,9 +1151,16 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
                            .as_ref()
                            .and_then(|args| args.args.get(0))
                            .and_then(|arg| match arg {
-                                hir::GenericArg::Type(ty) => {
-                                    sess.source_map().span_to_snippet(ty.span).ok()
+                                hir::GenericArg::Type(ty) => match ty.kind {
+                                    hir::TyKind::Tup(t) => t
+                                        .iter()
+                                        .map(|e| sess.source_map().span_to_snippet(e.span))
+                                        .collect::<Result<Vec<_>, _>>()
+                                        .map(|a| a.join(", ")),
+                                    _ => sess.source_map().span_to_snippet(ty.span),
                                }
+                                .map(|s| format!("({})", s))
+                                .ok(),
                                _ => None,
                            })
                            .unwrap_or_else(|| "()".to_string()),