File tree Expand file tree Collapse file tree 2 files changed +4
-14
lines changed Expand file tree Collapse file tree 2 files changed +4
-14
lines changed Original file line number Diff line number Diff line change @@ -1488,20 +1488,10 @@ macro_rules! tuple {
1488
1488
impl <$( $name: Debug ) ,* > Debug for ( $( $name, ) * ) {
1489
1489
#[ allow( non_snake_case, unused_assignments) ]
1490
1490
fn fmt( & self , f: & mut Formatter ) -> Result {
1491
- try! ( write! ( f , "(" ) ) ;
1491
+ let mut builder = f . debug_tuple ( "" ) ;
1492
1492
let ( $( ref $name, ) * ) = * self ;
1493
- let mut n = 0 ;
1494
- $(
1495
- if n > 0 {
1496
- try!( write!( f, ", " ) ) ;
1497
- }
1498
- try!( write!( f, "{:?}" , * $name) ) ;
1499
- n += 1 ;
1500
- ) *
1501
- if n == 1 {
1502
- try!( write!( f, "," ) ) ;
1503
- }
1504
- write!( f, ")" )
1493
+ $( builder. field( $name) ; ) *
1494
+ builder. finish( )
1505
1495
}
1506
1496
}
1507
1497
peel! { $( $name, ) * }
Original file line number Diff line number Diff line change @@ -60,7 +60,7 @@ fn test_tuple_cmp() {
60
60
#[ test]
61
61
fn test_show ( ) {
62
62
let s = format ! ( "{:?}" , ( 1 , ) ) ;
63
- assert_eq ! ( s, "(1, )" ) ;
63
+ assert_eq ! ( s, "(1)" ) ;
64
64
let s = format ! ( "{:?}" , ( 1 , true ) ) ;
65
65
assert_eq ! ( s, "(1, true)" ) ;
66
66
let s = format ! ( "{:?}" , ( 1 , "hi" , true ) ) ;
You can’t perform that action at this time.
0 commit comments