Skip to content

Commit 669494b

Browse files
committed
Rollup merge of #31269 - ollie27:patch-3, r=alexcrichton
It got lost in #31121.
2 parents 37316e8 + 515fac1 commit 669494b

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

src/librustdoc/html/format.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ impl fmt::Display for clean::Type {
460460
[] => primitive_link(f, clean::PrimitiveTuple, "()"),
461461
[ref one] => {
462462
try!(primitive_link(f, clean::PrimitiveTuple, "("));
463-
try!(write!(f, "{}", one));
463+
try!(write!(f, "{},", one));
464464
primitive_link(f, clean::PrimitiveTuple, ")")
465465
}
466466
many => {

src/test/rustdoc/tuples.rs

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![crate_name = "foo"]
12+
13+
// @has foo/fn.tuple0.html //pre 'pub fn tuple0(x: ())'
14+
pub fn tuple0(x: ()) -> () { x }
15+
// @has foo/fn.tuple1.html //pre 'pub fn tuple1(x: (i32,)) -> (i32,)'
16+
pub fn tuple1(x: (i32,)) -> (i32,) { x }
17+
// @has foo/fn.tuple2.html //pre 'pub fn tuple2(x: (i32, i32)) -> (i32, i32)'
18+
pub fn tuple2(x: (i32, i32)) -> (i32, i32) { x }

0 commit comments

Comments
 (0)