nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-29 18:23:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

libgraphviz: Remove all uses of ~str from libgraphviz.

Browse Source
This commit is contained in:
Patrick Walton 2014-05-12 21:14:03 -07:00
parent ec5911b2a6
commit e786a745b5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libgraphviz/lib.rs
View File

@ -433,10 +433,10 @@ impl<'a> LabelText<'a> {
}
/// Renders text as string suitable for a label in a .dot file.
pub fn escape(&self) -> ~str {
pub fn escape(&self) -> StrBuf {
match self {
&LabelStr(ref s) => s.as_slice().escape_default(),
&EscStr(ref s) => LabelText::escape_str(s.as_slice()).into_owned(),
&LabelStr(ref s) => s.as_slice().escape_default().to_strbuf(),
&EscStr(ref s) => LabelText::escape_str(s.as_slice()).to_strbuf(),
}
}
}
@ -661,11 +661,14 @@ mod tests {
}
}
fn test_input(g: LabelledGraph) -> IoResult<~str> {
fn test_input(g: LabelledGraph) -> IoResult<StrBuf> {
let mut writer = MemWriter::new();
render(&g, &mut writer).unwrap();
let mut r = BufReader::new(writer.get_ref());
r.read_to_str()
match r.read_to_str() {
Ok(string) => Ok(string.to_strbuf()),
Err(err) => Err(err),
}
}
// All of the tests use raw-strings as the format for the expected outputs,