From dd0baf7f01fc470fb7406b785d03e24fa116ed1c Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 25 Dec 2014 15:26:16 +0100 Subject: [PATCH] Fix up remaining usage of `to_ascii`. --- src/compiletest/runtest.rs | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs index bf72250c470..1abcd8bd214 100644 --- a/src/compiletest/runtest.rs +++ b/src/compiletest/runtest.rs @@ -21,6 +21,8 @@ use util::logv; #[cfg(target_os = "windows")] use util; +#[cfg(target_os = "windows")] +use std::ascii::AsciiExt; use std::io::File; use std::io::fs::PathExtensions; use std::io::fs; @@ -985,22 +987,9 @@ fn check_expected_errors(expected_errors: Vec , format!("{}:{}:", testfile.display(), ee.line) }).collect:: >(); - #[cfg(target_os = "windows")] - fn to_lower( s : &str ) -> String { - let i = s.chars(); - let c : Vec = i.map( |c| { - if c.is_ascii() { - c.to_ascii().to_lowercase().as_char() - } else { - c - } - } ).collect(); - String::from_chars(c.as_slice()) - } - #[cfg(windows)] fn prefix_matches( line : &str, prefix : &str ) -> bool { - to_lower(line).as_slice().starts_with(to_lower(prefix).as_slice()) + line.to_ascii_lowercase().starts_with(prefix.to_ascii_lowercase().as_slice()) } #[cfg(unix)]