From fc2ae08b9ca0c783ad505b34706bf6e9f8dc0fc4 Mon Sep 17 00:00:00 2001 From: Graham Fawcett Date: Wed, 18 Jan 2012 16:11:04 -0500 Subject: [PATCH] issue #1352: change param order on {std,core}::extfmt::str_init_elt to mirror vec::init_elt. --- src/libcore/extfmt.rs | 8 ++++---- src/libstd/extfmt.rs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libcore/extfmt.rs b/src/libcore/extfmt.rs index a4a908b1c42d..38b36f59d323 100644 --- a/src/libcore/extfmt.rs +++ b/src/libcore/extfmt.rs @@ -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 } }; @@ -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::(n_elts, c as u8); ret str::unsafe_from_bytes(svec); @@ -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; @@ -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 diff --git a/src/libstd/extfmt.rs b/src/libstd/extfmt.rs index 3e01d67bc553..16a5cca4c94b 100644 --- a/src/libstd/extfmt.rs +++ b/src/libstd/extfmt.rs @@ -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 } }; @@ -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::(n_elts, c as u8); ret str::unsafe_from_bytes(svec); @@ -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; @@ -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