diff options
Diffstat (limited to 'src/compiletest/util.rs')
| -rw-r--r-- | src/compiletest/util.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/compiletest/util.rs b/src/compiletest/util.rs index 253b7e87d02..942541c79ee 100644 --- a/src/compiletest/util.rs +++ b/src/compiletest/util.rs @@ -33,25 +33,25 @@ pub fn get_os(triple: &str) -> &'static str { } #[cfg(target_os = "win32")] -pub fn make_new_path(path: &str) -> ~str { +pub fn make_new_path(path: &str) -> StrBuf { // Windows just uses PATH as the library search path, so we have to // maintain the current value while adding our own - match getenv(lib_path_env_var()) { + match getenv(lib_path_env_var().as_slice()) { Some(curr) => { - format!("{}{}{}", path, path_div(), curr) + format_strbuf!("{}{}{}", path, path_div(), curr) } - None => path.to_str() + None => path.to_str().to_strbuf() } } #[cfg(target_os = "win32")] -pub fn lib_path_env_var() -> ~str { "PATH".to_owned() } +pub fn lib_path_env_var() -> StrBuf { "PATH".to_strbuf() } #[cfg(target_os = "win32")] -pub fn path_div() -> ~str { ";".to_owned() } +pub fn path_div() -> StrBuf { ";".to_strbuf() } -pub fn logv(config: &Config, s: ~str) { +pub fn logv(config: &Config, s: StrBuf) { debug!("{}", s); if config.verbose { println!("{}", s); } } |
