diff options
| author | Richo Healey <richo@psych0tik.net> | 2014-06-21 03:39:03 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-07-08 13:01:43 -0700 |
| commit | 12c334a77b897f7b1cb6cff3c56a71ecb89c82af (patch) | |
| tree | 1f5a85061a69058875391ec6171cf8b446996dff /src/libtest | |
| parent | bfe4ddfdea45533c98657701509bb7185fd96cba (diff) | |
| download | rust-12c334a77b897f7b1cb6cff3c56a71ecb89c82af.tar.gz rust-12c334a77b897f7b1cb6cff3c56a71ecb89c82af.zip | |
std: Rename the `ToStr` trait to `ToString`, and `to_str` to `to_string`.
[breaking-change]
Diffstat (limited to 'src/libtest')
| -rw-r--r-- | src/libtest/lib.rs | 8 | ||||
| -rw-r--r-- | src/libtest/stats.rs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index 1eb13fd660e..b80f47e6c93 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -370,7 +370,7 @@ pub fn parse_opts(args: &[String]) -> Option<OptRes> { let matches = match getopts::getopts(args_.as_slice(), optgroups().as_slice()) { Ok(m) => m, - Err(f) => return Some(Err(f.to_str())) + Err(f) => return Some(Err(f.to_string())) }; if matches.opt_present("h") { usage(args[0].as_slice()); return None; } @@ -634,7 +634,7 @@ impl<T: Writer> ConsoleTestState<T> { let mut failures = Vec::new(); let mut fail_out = String::new(); for &(ref f, ref stdout) in self.failures.iter() { - failures.push(f.name.to_str()); + failures.push(f.name.to_string()); if stdout.len() > 0 { fail_out.push_str(format!("---- {} stdout ----\n\t", f.name.as_slice()).as_slice()); @@ -1522,7 +1522,7 @@ mod tests { let filtered = filter_tests(&opts, tests); assert_eq!(filtered.len(), 1); - assert_eq!(filtered.get(0).desc.name.to_str(), + assert_eq!(filtered.get(0).desc.name.to_string(), "1".to_string()); assert!(filtered.get(0).desc.ignore == false); } @@ -1573,7 +1573,7 @@ mod tests { "test::sort_tests".to_string()); for (a, b) in expected.iter().zip(filtered.iter()) { - assert!(*a == b.desc.name.to_str()); + assert!(*a == b.desc.name.to_string()); } } diff --git a/src/libtest/stats.rs b/src/libtest/stats.rs index 8db9a4f53aa..325582ff99c 100644 --- a/src/libtest/stats.rs +++ b/src/libtest/stats.rs @@ -385,8 +385,8 @@ pub fn write_boxplot<T: Float + Show + FromPrimitive>( let range = hi - lo; - let lostr = lo.to_str(); - let histr = hi.to_str(); + let lostr = lo.to_string(); + let histr = hi.to_string(); let overhead_width = lostr.len() + histr.len() + 4; let range_width = width_hint - overhead_width; |
