Skip to content

Commit

Permalink
issue #1352: change param order on {std,core}::extfmt::str_init_elt t…
Browse files Browse the repository at this point in the history
…o mirror vec::init_elt.
  • Loading branch information
gmfawcett authored and brson committed Jan 21, 2012
1 parent 7763b40 commit fc2ae08
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions src/libcore/extfmt.rs
Expand Up @@ -374,7 +374,7 @@ mod rt {
let len = str::char_len(s);
if len < prec {
let diff = prec - len;
let pad = str_init_elt('0', diff);
let pad = str_init_elt(diff, '0');
pad + s
} else { s }
};
Expand All @@ -387,7 +387,7 @@ mod rt {
}

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

ret str::unsafe_from_bytes(svec);
Expand All @@ -408,7 +408,7 @@ mod rt {
let padchar = ' ';
let diff = uwidth - strlen;
if have_flag(cv.flags, flag_left_justify) {
let padstr = str_init_elt(padchar, diff);
let padstr = str_init_elt(diff, padchar);
ret s + padstr;
}
let might_zero_pad = false;
Expand All @@ -430,7 +430,7 @@ mod rt {
padchar = '0';
zero_padding = true;
}
let padstr = str_init_elt(padchar, diff);
let padstr = str_init_elt(diff, padchar);
// This is completely heinous. If we have a signed value then
// potentially rip apart the intermediate result and insert some
// zeros. It may make sense to convert zero padding to a precision
Expand Down
8 changes: 4 additions & 4 deletions src/libstd/extfmt.rs
Expand Up @@ -366,7 +366,7 @@ mod rt {
let len = str::char_len(s);
if len < prec {
let diff = prec - len;
let pad = str_init_elt('0', diff);
let pad = str_init_elt(diff, '0');
pad + s
} else { s }
};
Expand All @@ -379,7 +379,7 @@ mod rt {
}

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

ret str::unsafe_from_bytes(svec);
Expand All @@ -400,7 +400,7 @@ mod rt {
let padchar = ' ';
let diff = uwidth - strlen;
if have_flag(cv.flags, flag_left_justify) {
let padstr = str_init_elt(padchar, diff);
let padstr = str_init_elt(diff, padchar);
ret s + padstr;
}
let might_zero_pad = false;
Expand All @@ -422,7 +422,7 @@ mod rt {
padchar = '0';
zero_padding = true;
}
let padstr = str_init_elt(padchar, diff);
let padstr = str_init_elt(diff, padchar);
// This is completely heinous. If we have a signed value then
// potentially rip apart the intermediate result and insert some
// zeros. It may make sense to convert zero padding to a precision
Expand Down

0 comments on commit fc2ae08

Please sign in to comment.