Skip to content

Commit fc2ae08

Browse files
gmfawcettbrson
authored andcommitted
issue #1352: change param order on {std,core}::extfmt::str_init_elt to mirror vec::init_elt.
1 parent 7763b40 commit fc2ae08

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Diff for: src/libcore/extfmt.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ mod rt {
374374
let len = str::char_len(s);
375375
if len < prec {
376376
let diff = prec - len;
377-
let pad = str_init_elt('0', diff);
377+
let pad = str_init_elt(diff, '0');
378378
pad + s
379379
} else { s }
380380
};
@@ -387,7 +387,7 @@ mod rt {
387387
}
388388

389389
// FIXME: This might be useful in str: but needs to be utf8 safe first
390-
fn str_init_elt(c: char, n_elts: uint) -> str {
390+
fn str_init_elt(n_elts: uint, c: char) -> str {
391391
let svec = vec::init_elt::<u8>(n_elts, c as u8);
392392

393393
ret str::unsafe_from_bytes(svec);
@@ -408,7 +408,7 @@ mod rt {
408408
let padchar = ' ';
409409
let diff = uwidth - strlen;
410410
if have_flag(cv.flags, flag_left_justify) {
411-
let padstr = str_init_elt(padchar, diff);
411+
let padstr = str_init_elt(diff, padchar);
412412
ret s + padstr;
413413
}
414414
let might_zero_pad = false;
@@ -430,7 +430,7 @@ mod rt {
430430
padchar = '0';
431431
zero_padding = true;
432432
}
433-
let padstr = str_init_elt(padchar, diff);
433+
let padstr = str_init_elt(diff, padchar);
434434
// This is completely heinous. If we have a signed value then
435435
// potentially rip apart the intermediate result and insert some
436436
// zeros. It may make sense to convert zero padding to a precision

Diff for: src/libstd/extfmt.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ mod rt {
366366
let len = str::char_len(s);
367367
if len < prec {
368368
let diff = prec - len;
369-
let pad = str_init_elt('0', diff);
369+
let pad = str_init_elt(diff, '0');
370370
pad + s
371371
} else { s }
372372
};
@@ -379,7 +379,7 @@ mod rt {
379379
}
380380

381381
// FIXME: This might be useful in str: but needs to be utf8 safe first
382-
fn str_init_elt(c: char, n_elts: uint) -> str {
382+
fn str_init_elt(n_elts: uint, c: char) -> str {
383383
let svec = vec::init_elt::<u8>(n_elts, c as u8);
384384

385385
ret str::unsafe_from_bytes(svec);
@@ -400,7 +400,7 @@ mod rt {
400400
let padchar = ' ';
401401
let diff = uwidth - strlen;
402402
if have_flag(cv.flags, flag_left_justify) {
403-
let padstr = str_init_elt(padchar, diff);
403+
let padstr = str_init_elt(diff, padchar);
404404
ret s + padstr;
405405
}
406406
let might_zero_pad = false;
@@ -422,7 +422,7 @@ mod rt {
422422
padchar = '0';
423423
zero_padding = true;
424424
}
425-
let padstr = str_init_elt(padchar, diff);
425+
let padstr = str_init_elt(diff, padchar);
426426
// This is completely heinous. If we have a signed value then
427427
// potentially rip apart the intermediate result and insert some
428428
// zeros. It may make sense to convert zero padding to a precision

0 commit comments

Comments
 (0)