From ad5ab2f360d618b18c593368c0a16603f42bfdcb Mon Sep 17 00:00:00 2001 From: Oliver Middleton Date: Thu, 28 Jan 2016 21:02:22 +0000 Subject: [PATCH 1/2] rustdoc: Add missing trailing comma for single element tuples --- src/librustdoc/html/format.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs index b0df209d3dc..9d5189cfd0b 100644 --- a/src/librustdoc/html/format.rs +++ b/src/librustdoc/html/format.rs @@ -460,7 +460,7 @@ impl fmt::Display for clean::Type { [] => primitive_link(f, clean::PrimitiveTuple, "()"), [ref one] => { try!(primitive_link(f, clean::PrimitiveTuple, "(")); - try!(write!(f, "{}", one)); + try!(write!(f, "{},", one)); primitive_link(f, clean::PrimitiveTuple, ")") } many => { From 515fac178a486a6a0135b0d20b3f5b1edfb03482 Mon Sep 17 00:00:00 2001 From: Oliver Middleton Date: Thu, 28 Jan 2016 23:40:35 +0000 Subject: [PATCH 2/2] rustdoc: Add test for tuple rendering --- src/test/rustdoc/tuples.rs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/test/rustdoc/tuples.rs diff --git a/src/test/rustdoc/tuples.rs b/src/test/rustdoc/tuples.rs new file mode 100644 index 00000000000..2269b38780d --- /dev/null +++ b/src/test/rustdoc/tuples.rs @@ -0,0 +1,18 @@ +// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![crate_name = "foo"] + +// @has foo/fn.tuple0.html //pre 'pub fn tuple0(x: ())' +pub fn tuple0(x: ()) -> () { x } +// @has foo/fn.tuple1.html //pre 'pub fn tuple1(x: (i32,)) -> (i32,)' +pub fn tuple1(x: (i32,)) -> (i32,) { x } +// @has foo/fn.tuple2.html //pre 'pub fn tuple2(x: (i32, i32)) -> (i32, i32)' +pub fn tuple2(x: (i32, i32)) -> (i32, i32) { x }