nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-27 07:55:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

std: convert str::repeat to a method.

Browse Source
This commit is contained in:
Huon Wilson 2013-06-11 12:05:42 +10:00
parent 3c23a0a836
commit 8786bca7e2
3 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libextra/getopts.rs
View File

@ -593,7 +593,7 @@ pub mod groups {
*/
pub fn usage(brief: &str, opts: &[OptGroup]) -> ~str {
let desc_sep = ~"\n" + str::repeat(" ", 24);
let desc_sep = ~"\n" + " ".repeat(24);
let rows = vec::map(opts, |optref| {
let OptGroup{short_name: short_name,
@ -603,7 +603,7 @@ pub mod groups {
hasarg: hasarg,
_} = copy *optref;
let mut row = str::repeat(" ", 4);
let mut row = " ".repeat(4);
// short option
row += match short_name.len() {
@ -629,7 +629,7 @@ pub mod groups {
// here we just need to indent the start of the description
let rowlen = row.len();
row += if rowlen < 24 {
str::repeat(" ", 24 - rowlen)
" ".repeat(24 - rowlen)
} else {
copy desc_sep
};

2
src/librust/rust.rc
View File

@ -225,7 +225,7 @@ fn usage() {
);
for commands.each |command| {
let padding = str::repeat(" ", indent - command.cmd.len());
let padding = " ".repeat(indent - command.cmd.len());
io::println(fmt!(" %s%s%s",
command.cmd, padding, command.usage_line));
}

58
src/libstd/str.rs
View File

@ -304,29 +304,6 @@ impl<'self> StrVector for &'self [&'self str] {
}
}
/// Given a string, make a new string with repeated copies of it
pub fn repeat(ss: &str, nn: uint) -> ~str {
do as_buf(ss) |buf, len| {
let mut ret = ~"";
// ignore the NULL terminator
let len = len - 1;
ret.reserve(nn * len);
unsafe {
do as_buf(ret) |rbuf, _len| {
let mut rbuf = ::cast::transmute_mut_unsafe(rbuf);
for nn.times {
ptr::copy_memory(rbuf, buf, len);
rbuf = rbuf.offset(len);
}
}
raw::set_len(&mut ret, nn * len);
}
ret
}
}
/*
Section: Adding to and removing from a string
*/
@ -1567,6 +1544,8 @@ pub trait StrSlice<'self> {
fn find<C: CharEq>(&self, search: C) -> Option<uint>;
fn rfind<C: CharEq>(&self, search: C) -> Option<uint>;
fn find_str(&self, &str) -> Option<uint>;
fn repeat(&self, nn: uint) -> ~str;
}
/// Extension methods for strings
@ -2083,6 +2062,29 @@ impl<'self> StrSlice<'self> for &'self str {
.map_consume(|(start, _end)| start)
}
}
/// Given a string, make a new string with repeated copies of it.
fn repeat(&self, nn: uint) -> ~str {
do as_buf(*self) |buf, len| {
let mut ret = ~"";
// ignore the NULL terminator
let len = len - 1;
ret.reserve(nn * len);
unsafe {
do as_buf(ret) |rbuf, _len| {
let mut rbuf = ::cast::transmute_mut_unsafe(rbuf);
for nn.times {
ptr::copy_memory(rbuf, buf, len);
rbuf = rbuf.offset(len);
}
}
raw::set_len(&mut ret, nn * len);
}
ret
}
}
}
#[allow(missing_doc)]
@ -2541,11 +2543,11 @@ mod tests {
#[test]
fn test_repeat() {
assert_eq!(repeat("x", 4), ~"xxxx");
assert_eq!(repeat("hi", 4), ~"hihihihi");
assert_eq!(repeat("ไท华", 3), ~"ไท华ไท华ไท华");
assert_eq!(repeat("", 4), ~"");
assert_eq!(repeat("hi", 0), ~"");
assert_eq!("x".repeat(4), ~"xxxx");
assert_eq!("hi".repeat(4), ~"hihihihi");
assert_eq!("ไท华".repeat(3), ~"ไท华ไท华ไท华");
assert_eq!("".repeat(4), ~"");
assert_eq!("hi".repeat(0), ~"");
}
#[test]