Convert std::os to istrs. Issue #855

4 files changed, 19 insertions, 13 deletions

diff --git a/src/lib/fs.rs b/src/lib/fs.rs
index 9bf6d40323f..6005467438e 100644
--- a/src/lib/fs.rs
+++ b/src/lib/fs.rs
@@ -70,7 +70,7 @@ fn make_absolute(p: &path) -> path {
     if path_is_absolute(p) {
         ret p;
     } else {
-        ret connect(istr::from_estr(getcwd()), p);
+        ret connect(getcwd(), p);
     }
 }
 
diff --git a/src/lib/linux_os.rs b/src/lib/linux_os.rs
index 868b47471bc..4c67a01fc56 100644
--- a/src/lib/linux_os.rs
+++ b/src/lib/linux_os.rs
@@ -52,11 +52,11 @@ mod libc_constants {
     fn S_IWUSR() -> uint { ret 128u; }
 }
 
-fn exec_suffix() -> str { ret ""; }
+fn exec_suffix() -> istr { ret ~""; }
 
-fn target_os() -> str { ret "linux"; }
+fn target_os() -> istr { ret ~"linux"; }
 
-fn dylib_filename(base: str) -> str { ret "lib" + base + ".so"; }
+fn dylib_filename(base: &istr) -> istr { ret ~"lib" + base + ~".so"; }
 
 fn pipe() -> {in: int, out: int} {
     let fds = {mutable in: 0, mutable out: 0};
@@ -76,7 +76,9 @@ native "rust" mod rustrt {
     fn rust_getcwd() -> str;
 }
 
-fn getcwd() -> str { ret rustrt::rust_getcwd(); }
+fn getcwd() -> istr {
+    ret istr::from_estr(rustrt::rust_getcwd());
+}
 
 
 // Local Variables:
diff --git a/src/lib/macos_os.rs b/src/lib/macos_os.rs
index ba79eddcfc2..2ac38c35aa8 100644
--- a/src/lib/macos_os.rs
+++ b/src/lib/macos_os.rs
@@ -49,11 +49,11 @@ mod libc_constants {
     fn S_IWUSR() -> uint { ret 512u; }
 }
 
-fn exec_suffix() -> str { ret ""; }
+fn exec_suffix() -> istr { ret ~""; }
 
-fn target_os() -> str { ret "macos"; }
+fn target_os() -> istr { ret ~"macos"; }
 
-fn dylib_filename(base: str) -> str { ret "lib" + base + ".dylib"; }
+fn dylib_filename(base: &istr) -> istr { ret ~"lib" + base + ~".dylib"; }
 
 fn pipe() -> {in: int, out: int} {
     let fds = {mutable in: 0, mutable out: 0};
@@ -73,7 +73,9 @@ native "rust" mod rustrt {
     fn rust_getcwd() -> str;
 }
 
-fn getcwd() -> str { ret rustrt::rust_getcwd(); }
+fn getcwd() -> istr {
+    ret istr::from_estr(rustrt::rust_getcwd());
+}
 
 
 // Local Variables:
diff --git a/src/lib/win32_os.rs b/src/lib/win32_os.rs
index 57944b5ff53..f7c3d4570dd 100644
--- a/src/lib/win32_os.rs
+++ b/src/lib/win32_os.rs
@@ -46,11 +46,11 @@ native "x86stdcall" mod kernel32 {
     fn SetEnvironmentVariableA(n: sbuf, v: sbuf) -> int;
 }
 
-fn exec_suffix() -> str { ret ".exe"; }
+fn exec_suffix() -> istr { ret ~".exe"; }
 
-fn target_os() -> str { ret "win32"; }
+fn target_os() -> istr { ret ~"win32"; }
 
-fn dylib_filename(base: str) -> str { ret base + ".dll"; }
+fn dylib_filename(base: &istr) -> istr { ret base + ~".dll"; }
 
 fn pipe() -> {in: int, out: int} {
     // Windows pipes work subtly differently than unix pipes, and their
@@ -78,7 +78,9 @@ native "rust" mod rustrt {
 
 fn waitpid(pid: int) -> int { ret rustrt::rust_process_wait(pid); }
 
-fn getcwd() -> str { ret rustrt::rust_getcwd(); }
+fn getcwd() -> istr {
+    ret istr::from_estr(rustrt::rust_getcwd());
+}
 
 // Local Variables:
 // mode: rust;