OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rustdoc: Use iterators to collapse whitespace 

Thanks, @alexcrichton!
This commit is contained in:
Michael Macias 2015-04-06 13:56:39 -05:00
parent b6c2e82b71
commit 46cc6e5fc3
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/librustdoc/html/markdown.rs
View File

@ -192,25 +192,11 @@ fn stripped_filtered_line<'a>(s: &'a str) -> Option<&'a str> {
/// Returns a new string with all consecutive whitespace collapsed into
/// single spaces.
///
/// The input is assumed to be already trimmed.
/// Any leading or trailing whitespace will be trimmed.
fn collapse_whitespace(s: &str) -> String {
let mut buffer = String::with_capacity(s.len());
let mut previous_char_is_whitespace = false;
for c in s.chars() {
if c.is_whitespace() {
if !previous_char_is_whitespace {
buffer.push(' ');
}
previous_char_is_whitespace = true;
} else {
buffer.push(c);
previous_char_is_whitespace = false;
}
}
buffer
s.split(|c: char| c.is_whitespace()).filter(|s| {
!s.is_empty()
}).collect::<Vec<_>>().connect(" ")
}
thread_local!(static USED_HEADER_MAP: RefCell<HashMap<String, usize>> = {
@ -623,8 +609,9 @@ mod tests {
}
t("foo", "foo");
t("foo bar", "foo bar");
t("foo bar\nbaz", "foo bar baz");
t("foo bar \n baz\t\tqux", "foo bar baz qux");
t("foo bar baz", "foo bar baz");
t(" foo bar", "foo bar");
t("\tfoo bar\nbaz", "foo bar baz");
t("foo bar \n baz\t\tqux\n", "foo bar baz qux");
}
}