---

yaml
---
r: 146060
b: refs/heads/try2
c: 93b95dd
h: refs/heads/master
v: v3

Author: thestinger

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 69860b79b8f4882426fb5755c6d00e6717adeb38
+refs/heads/try2: 93b95dd394c9c98c9a00bfcbdc0d6c9c8c59762e
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/back/link.rs

@@ -297,7 +297,7 @@ pub mod write {
             if !sess.no_prepopulate_passes() {
                 llvm::LLVMRustAddAnalysisPasses(tm, fpm, llmod);
                 llvm::LLVMRustAddAnalysisPasses(tm, mpm, llmod);
-                populate_llvm_passess(fpm, mpm, llmod, OptLevel);
+                populate_llvm_passes(fpm, mpm, llmod, OptLevel);
             }
 
             for pass in sess.opts.custom_passes.iter() {
@@ -422,10 +422,10 @@ pub mod write {
         }
     }
 
-    unsafe fn populate_llvm_passess(fpm: lib::llvm::PassManagerRef,
-                                    mpm: lib::llvm::PassManagerRef,
-                                    llmod: ModuleRef,
-                                    opt: lib::llvm::CodeGenOptLevel) {
+    unsafe fn populate_llvm_passes(fpm: lib::llvm::PassManagerRef,
+                                   mpm: lib::llvm::PassManagerRef,
+                                   llmod: ModuleRef,
+                                   opt: lib::llvm::CodeGenOptLevel) {
         // Create the PassManagerBuilder for LLVM. We configure it with
         // reasonable defaults and prepare it to actually populate the pass
         // manager.

branches/try2/src/libstd/libc.rs

@@ -1208,7 +1208,7 @@ pub mod consts {
             pub static ERROR_ALREADY_EXISTS : c_int = 183;
             pub static ERROR_INVALID_ADDRESS : c_int = 487;
             pub static ERROR_FILE_INVALID : c_int = 1006;
-            pub static INVALID_HANDLE_VALUE : c_int = -1;
+            pub static INVALID_HANDLE_VALUE: c_int = -1;
 
             pub static DELETE : DWORD = 0x00010000;
             pub static READ_CONTROL : DWORD = 0x00020000;
@@ -3352,14 +3352,11 @@ pub mod funcs {
                                         LPSECURITY_ATTRIBUTES)
                                         -> BOOL;
                 pub fn CopyFileW(lpExistingFileName: LPCWSTR,
-                                 lpNewFileName: LPCWSTR,
-                                 bFailIfExists: BOOL)
-                                 -> BOOL;
+                                        lpNewFileName: LPCWSTR,
+                                        bFailIfExists: BOOL)
+                                        -> BOOL;
                 pub fn DeleteFileW(lpPathName: LPCWSTR) -> BOOL;
                 pub fn RemoveDirectoryW(lpPathName: LPCWSTR) -> BOOL;
-                pub fn GetCurrentDirectoryW(nBufferLength: DWORD,
-                                            lpBuffer: LPWSTR)
-                                            -> DWORD;
                 pub fn SetCurrentDirectoryW(lpPathName: LPCWSTR) -> BOOL;
                 pub fn GetLastError() -> DWORD;
                 pub fn FindFirstFileW(fileName: *u16, findFileData: HANDLE)
@@ -3465,9 +3462,6 @@ pub mod funcs {
                                         -> BOOL;
                 pub fn DeleteFileW(lpPathName: LPCWSTR) -> BOOL;
                 pub fn RemoveDirectoryW(lpPathName: LPCWSTR) -> BOOL;
-                pub fn GetCurrentDirectoryW(nBufferLength: DWORD,
-                                            lpBuffer: LPWSTR)
-                                            -> DWORD;
                 pub fn SetCurrentDirectoryW(lpPathName: LPCWSTR) -> BOOL;
                 pub fn GetLastError() -> DWORD;
                 pub fn FindFirstFileW(fileName: *u16, findFileData: HANDLE)

branches/try2/src/libstd/os.rs

@@ -28,8 +28,7 @@
 
 #[allow(missing_doc)];
 
-#[cfg(unix)]
-use c_str::CString;
+use c_str::{CString, ToCStr};
 use clone::Clone;
 use container::Container;
 use io;
@@ -57,11 +56,6 @@ pub fn close(fd: c_int) -> c_int {
     }
 }
 
-// On Windows, wide character version of function must be used to support
-// unicode, so functions should be split into at least two versions,
-// which are for Windows and for non-Windows, if necessary.
-// See https://github.com/mozilla/rust/issues/9822 for more information.
-
 pub mod rustrt {
     use libc::{c_char, c_int};
     use libc;
@@ -70,19 +64,11 @@ pub mod rustrt {
         pub fn rust_path_is_dir(path: *libc::c_char) -> c_int;
         pub fn rust_path_exists(path: *libc::c_char) -> c_int;
     }
-
-    // Uses _wstat instead of stat.
-    #[cfg(windows)]
-    extern {
-        pub fn rust_path_is_dir_u16(path: *u16) -> c_int;
-        pub fn rust_path_exists_u16(path: *u16) -> c_int;
-    }
 }
 
 pub static TMPBUF_SZ : uint = 1000u;
 static BUF_BYTES : uint = 2048u;
 
-#[cfg(unix)]
 pub fn getcwd() -> Path {
     #[fixed_stack_segment]; #[inline(never)];
     let mut buf = [0 as libc::c_char, ..BUF_BYTES];
@@ -97,22 +83,6 @@ pub fn getcwd() -> Path {
     }
 }
 
-#[cfg(windows)]
-pub fn getcwd() -> Path {
-    #[fixed_stack_segment]; #[inline(never)];
-    use libc::DWORD;
-    use libc::GetCurrentDirectoryW;
-    let mut buf = [0 as u16, ..BUF_BYTES];
-    do buf.as_mut_buf |buf, len| {
-        unsafe {
-            if libc::GetCurrentDirectoryW(len as DWORD, buf) == 0 as DWORD {
-                fail2!();
-            }
-        }
-    }
-    Path::new(str::from_utf16(buf))
-}
-
 #[cfg(windows)]
 pub mod win32 {
     use libc;
@@ -643,7 +613,6 @@ pub fn walk_dir(p: &Path, f: &fn(&Path) -> bool) -> bool {
     })
 }
 
-#[cfg(unix)]
 /// Indicates whether a path represents a directory
 pub fn path_is_dir(p: &Path) -> bool {
     #[fixed_stack_segment]; #[inline(never)];
@@ -654,18 +623,6 @@ pub fn path_is_dir(p: &Path) -> bool {
     }
 }
 
-
-#[cfg(windows)]
-pub fn path_is_dir(p: &Path) -> bool {
-    #[fixed_stack_segment]; #[inline(never)];
-    unsafe {
-        do os::win32::as_utf16_p(p.as_str().unwrap()) |buf| {
-            rustrt::rust_path_is_dir_u16(buf) != 0 as c_int
-        }
-    }
-}
-
-#[cfg(unix)]
 /// Indicates whether a path exists
 pub fn path_exists(p: &Path) -> bool {
     #[fixed_stack_segment]; #[inline(never)];
@@ -676,16 +633,6 @@ pub fn path_exists(p: &Path) -> bool {
     }
 }
 
-#[cfg(windows)]
-pub fn path_exists(p: &Path) -> bool {
-    #[fixed_stack_segment]; #[inline(never)];
-    unsafe {
-        do os::win32::as_utf16_p(p.as_str().unwrap()) |buf| {
-            rustrt::rust_path_exists_u16(buf) != 0 as c_int
-        }
-    }
-}
-
 /**
  * Convert a relative path to an absolute path
  *
@@ -1975,47 +1922,15 @@ mod tests {
 
     #[test]
     fn path_is_dir() {
-        use rt::io::file::open;
-        use rt::io::{OpenOrCreate, Read};
-
         assert!((os::path_is_dir(&Path::new("."))));
         assert!((!os::path_is_dir(&Path::new("test/stdtest/fs.rs"))));
-
-        let mut dirpath = os::tmpdir();
-        dirpath.push(format!("rust-test-{}/test-\uac00\u4e00\u30fc\u4f60\u597d",
-            rand::random::<u32>())); // 가一ー你好
-        debug2!("path_is_dir dirpath: {}", dirpath.display());
-
-        let mkdir_result = os::mkdir_recursive(&dirpath, (S_IRUSR | S_IWUSR | S_IXUSR) as i32);
-        debug2!("path_is_dir mkdir_result: {}", mkdir_result);
-
-        assert!((os::path_is_dir(&dirpath)));
-
-        let mut filepath = dirpath;
-        filepath.push("unicode-file-\uac00\u4e00\u30fc\u4f60\u597d.rs");
-        debug2!("path_is_dir filepath: {}", filepath.display());
-
-        open(&filepath, OpenOrCreate, Read); // ignore return; touch only
-        assert!((!os::path_is_dir(&filepath)));
-
-        assert!((!os::path_is_dir(&Path::new(
-                     "test/unicode-bogus-dir-\uac00\u4e00\u30fc\u4f60\u597d"))));
     }
 
     #[test]
     fn path_exists() {
         assert!((os::path_exists(&Path::new("."))));
         assert!((!os::path_exists(&Path::new(
                      "test/nonexistent-bogus-path"))));
-
-        let mut dirpath = os::tmpdir();
-        dirpath.push(format!("rust-test-{}/test-\uac01\u4e01\u30fc\u518d\u89c1",
-            rand::random::<u32>())); // 각丁ー再见
-
-        os::mkdir_recursive(&dirpath, (S_IRUSR | S_IWUSR | S_IXUSR) as i32);
-        assert!((os::path_exists(&dirpath)));
-        assert!((!os::path_exists(&Path::new(
-                     "test/unicode-bogus-path-\uac01\u4e01\u30fc\u518d\u89c1"))));
     }
 
     #[test]

branches/try2/src/rt/rust_builtin.cpp

@@ -106,7 +106,7 @@ rust_list_dir_wfd_fp_buf(void* wfd) {
 #endif
 
 extern "C" CDECL int
-rust_path_is_dir(const char *path) {
+rust_path_is_dir(char *path) {
     struct stat buf;
     if (stat(path, &buf)) {
         return 0;
@@ -115,48 +115,14 @@ rust_path_is_dir(const char *path) {
 }
 
 extern "C" CDECL int
-#if defined(__WIN32__)
-rust_path_is_dir_u16(const wchar_t *path) {
-    struct _stat buf;
-    // Don't use GetFileAttributesW, it cannot get attributes of
-    // some system files (e.g. pagefile.sys).
-    if (_wstat(path, &buf)) {
-        return 0;
-    }
-    return S_ISDIR(buf.st_mode);
-}
-#else
-rust_path_is_dir_u16(const void *path) {
-    // Wide version of function is only used on Windows.
-    return 0;
-}
-#endif
-
-extern "C" CDECL int
-rust_path_exists(const char *path) {
+rust_path_exists(char *path) {
     struct stat buf;
     if (stat(path, &buf)) {
         return 0;
     }
     return 1;
 }
 
-extern "C" CDECL int
-#if defined(__WIN32__)
-rust_path_exists_u16(const wchar_t *path) {
-    struct _stat buf;
-    if (_wstat(path, &buf)) {
-        return 0;
-    }
-    return 1;
-}
-#else
-rust_path_exists_u16(const void *path) {
-    // Wide version of function is only used on Windows.
-    return 0;
-}
-#endif
-
 extern "C" CDECL FILE* rust_get_stdin() {return stdin;}
 extern "C" CDECL FILE* rust_get_stdout() {return stdout;}
 extern "C" CDECL FILE* rust_get_stderr() {return stderr;}
@@ -327,12 +293,8 @@ rust_localtime(int64_t sec, int32_t nsec, rust_tm *timeptr) {
     const char* zone = NULL;
 #if defined(__WIN32__)
     int32_t gmtoff = -timezone;
-    wchar_t wbuffer[64];
-    char buffer[256];
-    // strftime("%Z") can contain non-UTF-8 characters on non-English locale (issue #9418),
-    // so time zone should be converted from UTF-16 string set by wcsftime.
-    if (wcsftime(wbuffer, sizeof(wbuffer) / sizeof(wchar_t), L"%Z", &tm) > 0) {
-        WideCharToMultiByte(CP_UTF8, 0, wbuffer, -1, buffer, sizeof(buffer), NULL, NULL);
+    char buffer[64];
+    if (strftime(buffer, sizeof(buffer), "%Z", &tm) > 0) {
         zone = buffer;
     }
 #else

branches/try2/src/rt/rust_globals.h

@@ -54,14 +54,6 @@
 #include <assert.h>
 
 #if defined(__WIN32__)
-// Prevent unnecessary #include's from <windows.h>
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-// Prevent defining min and max macro
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
 extern "C" {
 #include <windows.h>
 #include <tchar.h>

branches/try2/src/rt/rustrt.def.in

@@ -10,9 +10,7 @@ rust_timegm
 rust_mktime
 precise_time_ns
 rust_path_is_dir
-rust_path_is_dir_u16
 rust_path_exists
-rust_path_exists_u16
 rust_get_stdin
 rust_get_stdout
 rust_get_stderr