---

yaml
---
r: 72599
b: refs/heads/dist-snap
c: ec9c7c3
h: refs/heads/master
i:
  72597: f987904
  72595: 87a9291
  72591: c3353bd
v: v3

Author: bors

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: b50030718cf28f2a5a81857a26b57442734fe854
-refs/heads/dist-snap: 23e97ae89303f7e8933dce0c42de08d214bad066
+refs/heads/dist-snap: ec9c7c324e5aab7665ef3626b85dba2b1ecdbe29
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/etc/unicode.py

@@ -235,6 +235,10 @@ def emit_decomp_module(f, canon, compat):
 rf = open(r, "w")
 
 (canon_decomp, compat_decomp, gencats) = load_unicode_data("UnicodeData.txt")
+
+# Explain that the source code was generated by this script.
+rf.write('// The following code was generated by "src/etc/unicode.py"\n\n')
+
 emit_property_module(rf, "general_category", gencats)
 
 #emit_decomp_module(rf, canon_decomp, compat_decomp)

branches/dist-snap/src/libcore/libc.rs

@@ -582,16 +582,12 @@ pub mod types {
 
                 pub type LPWSTR = *mut WCHAR;
                 pub type LPSTR = *mut CHAR;
-                pub type LPTSTR = *mut CHAR;
 
                 // Not really, but opaque to us.
                 pub type LPSECURITY_ATTRIBUTES = LPVOID;
 
                 pub type LPVOID = *mut c_void;
-                pub type LPBYTE = *mut BYTE;
                 pub type LPWORD = *mut WORD;
-                pub type LPDWORD = *mut DWORD;
-                pub type LPHANDLE = *mut HANDLE;
 
                 pub type LRESULT = LONG_PTR;
                 pub type PBOOL = *mut BOOL;
@@ -600,36 +596,6 @@ pub mod types {
 
                 pub type time64_t = i64;
                 pub type int64 = i64;
-
-                pub struct STARTUPINFO {
-                    cb: DWORD,
-                    lpReserved: LPTSTR,
-                    lpDesktop: LPTSTR,
-                    lpTitle: LPTSTR,
-                    dwX: DWORD,
-                    dwY: DWORD,
-                    dwXSize: DWORD,
-                    dwYSize: DWORD,
-                    dwXCountChars: DWORD,
-                    dwYCountCharts: DWORD,
-                    dwFillAttribute: DWORD,
-                    dwFlags: DWORD,
-                    wShowWindow: WORD,
-                    cbReserved2: WORD,
-                    lpReserved2: LPBYTE,
-                    hStdInput: HANDLE,
-                    hStdOutput: HANDLE,
-                    hStdError: HANDLE
-                }
-                pub type LPSTARTUPINFO = *mut STARTUPINFO;
-
-                pub struct PROCESS_INFORMATION {
-                    hProcess: HANDLE,
-                    hThread: HANDLE,
-                    dwProcessId: DWORD,
-                    dwThreadId: DWORD
-                }
-                pub type LPPROCESS_INFORMATION = *mut PROCESS_INFORMATION;
             }
         }
     }
@@ -882,62 +848,13 @@ pub mod consts {
         pub mod bsd44 {
         }
         pub mod extra {
-            use libc::types::os::arch::extra::{DWORD, BOOL};
-
-            pub static TRUE : BOOL = 1;
-            pub static FALSE : BOOL = 0;
-
             pub static O_TEXT : int = 16384;
             pub static O_BINARY : int = 32768;
             pub static O_NOINHERIT: int = 128;
 
             pub static ERROR_SUCCESS : int = 0;
             pub static ERROR_INSUFFICIENT_BUFFER : int = 122;
             pub static INVALID_HANDLE_VALUE: int = -1;
-
-            pub static DELETE : DWORD = 0x00010000;
-            pub static READ_CONTROL : DWORD = 0x00020000;
-            pub static SYNCHRONIZE : DWORD = 0x00100000;
-            pub static WRITE_DAC : DWORD = 0x00040000;
-            pub static WRITE_OWNER : DWORD = 0x00080000;
-
-            pub static PROCESS_CREATE_PROCESS : DWORD = 0x0080;
-            pub static PROCESS_CREATE_THREAD : DWORD = 0x0002;
-            pub static PROCESS_DUP_HANDLE : DWORD = 0x0040;
-            pub static PROCESS_QUERY_INFORMATION : DWORD = 0x0400;
-            pub static PROCESS_QUERY_LIMITED_INFORMATION : DWORD = 0x1000;
-            pub static PROCESS_SET_INFORMATION : DWORD = 0x0200;
-            pub static PROCESS_SET_QUOTA : DWORD = 0x0100;
-            pub static PROCESS_SUSPEND_RESUME : DWORD = 0x0800;
-            pub static PROCESS_TERMINATE : DWORD = 0x0001;
-            pub static PROCESS_VM_OPERATION : DWORD = 0x0008;
-            pub static PROCESS_VM_READ : DWORD = 0x0010;
-            pub static PROCESS_VM_WRITE : DWORD = 0x0020;
-
-            pub static STARTF_FORCEONFEEDBACK : DWORD = 0x00000040;
-            pub static STARTF_FORCEOFFFEEDBACK : DWORD = 0x00000080;
-            pub static STARTF_PREVENTPINNING : DWORD = 0x00002000;
-            pub static STARTF_RUNFULLSCREEN : DWORD = 0x00000020;
-            pub static STARTF_TITLEISAPPID : DWORD = 0x00001000;
-            pub static STARTF_TITLEISLINKNAME : DWORD = 0x00000800;
-            pub static STARTF_USECOUNTCHARS : DWORD = 0x00000008;
-            pub static STARTF_USEFILLATTRIBUTE : DWORD = 0x00000010;
-            pub static STARTF_USEHOTKEY : DWORD = 0x00000200;
-            pub static STARTF_USEPOSITION : DWORD = 0x00000004;
-            pub static STARTF_USESHOWWINDOW : DWORD = 0x00000001;
-            pub static STARTF_USESIZE : DWORD = 0x00000002;
-            pub static STARTF_USESTDHANDLES : DWORD = 0x00000100;
-
-            pub static WAIT_ABANDONED : DWORD = 0x00000080;
-            pub static WAIT_OBJECT_0 : DWORD = 0x00000000;
-            pub static WAIT_TIMEOUT : DWORD = 0x00000102;
-            pub static WAIT_FAILED : DWORD = -1;
-
-            pub static DUPLICATE_CLOSE_SOURCE : DWORD = 0x00000001;
-            pub static DUPLICATE_SAME_ACCESS : DWORD = 0x00000002;
-
-            pub static INFINITE : DWORD = -1;
-            pub static STILL_ACTIVE : DWORD = 259;
         }
     }
 
@@ -1834,24 +1751,12 @@ pub mod funcs {
 
             unsafe fn sysctlnametomib(name: *c_char, mibp: *mut c_int,
                                sizep: *mut size_t) -> c_int;
-
-            unsafe fn getdtablesize() -> c_int;
         }
     }
 
 
     #[cfg(target_os = "linux")]
     #[cfg(target_os = "android")]
-    pub mod bsd44 {
-        use libc::types::os::arch::c95::{c_int};
-
-        #[abi = "cdecl"]
-        pub extern {
-            unsafe fn getdtablesize() -> c_int;
-        }
-    }
-
-
     #[cfg(target_os = "win32")]
     pub mod bsd44 {
     }
@@ -1885,11 +1790,9 @@ pub mod funcs {
         pub mod kernel32 {
             use libc::types::os::arch::c95::{c_uint};
             use libc::types::os::arch::extra::{BOOL, DWORD, HMODULE};
-            use libc::types::os::arch::extra::{LPCWSTR, LPWSTR, LPCTSTR,
-                                               LPTSTR, LPTCH, LPDWORD, LPVOID};
-            use libc::types::os::arch::extra::{LPSECURITY_ATTRIBUTES, LPSTARTUPINFO,
-                                               LPPROCESS_INFORMATION};
-            use libc::types::os::arch::extra::{HANDLE, LPHANDLE};
+            use libc::types::os::arch::extra::{LPCWSTR, LPWSTR, LPTCH};
+            use libc::types::os::arch::extra::{LPSECURITY_ATTRIBUTES};
+            use libc::types::os::arch::extra::{HANDLE};
 
             #[abi = "stdcall"]
             pub extern "stdcall" {
@@ -1926,45 +1829,19 @@ pub mod funcs {
                                        findFileData: HANDLE)
                     -> BOOL;
                 unsafe fn FindClose(findFile: HANDLE) -> BOOL;
-                unsafe fn DuplicateHandle(hSourceProcessHandle: HANDLE,
-                                          hSourceHandle: HANDLE,
-                                          hTargetProcessHandle: HANDLE,
-                                          lpTargetHandle: LPHANDLE,
-                                          dwDesiredAccess: DWORD,
-                                          bInheritHandle: BOOL,
-                                          dwOptions: DWORD) -> BOOL;
                 unsafe fn CloseHandle(hObject: HANDLE) -> BOOL;
-                unsafe fn OpenProcess(dwDesiredAccess: DWORD,
-                                      bInheritHandle: BOOL,
-                                      dwProcessId: DWORD) -> HANDLE;
-                unsafe fn GetCurrentProcess() -> HANDLE;
-                unsafe fn CreateProcessA(lpApplicationName: LPCTSTR,
-                                         lpCommandLine: LPTSTR,
-                                         lpProcessAttributes: LPSECURITY_ATTRIBUTES,
-                                         lpThreadAttributes: LPSECURITY_ATTRIBUTES,
-                                         bInheritHandles: BOOL,
-                                         dwCreationFlags: DWORD,
-                                         lpEnvironment: LPVOID,
-                                         lpCurrentDirectory: LPCTSTR,
-                                         lpStartupInfo: LPSTARTUPINFO,
-                                         lpProcessInformation: LPPROCESS_INFORMATION) -> BOOL;
-                unsafe fn WaitForSingleObject(hHandle: HANDLE, dwMilliseconds: DWORD) -> DWORD;
                 unsafe fn TerminateProcess(hProcess: HANDLE, uExitCode: c_uint) -> BOOL;
-                unsafe fn GetExitCodeProcess(hProcess: HANDLE, lpExitCode: LPDWORD) -> BOOL;
             }
         }
 
         pub mod msvcrt {
-            use libc::types::os::arch::c95::{c_int, c_long};
+            use libc::types::os::arch::c95::c_int;
 
             #[abi = "cdecl"]
             #[nolink]
             pub extern {
                 #[link_name = "_commit"]
                 unsafe fn commit(fd: c_int) -> c_int;
-
-                #[link_name = "_get_osfhandle"]
-                unsafe fn get_osfhandle(fd: c_int) -> c_long;
             }
         }
     }

branches/dist-snap/src/libcore/os.rs

@@ -373,7 +373,7 @@ pub fn pipe() -> Pipe {
         // inheritance has to be handled in a different way that I do not
         // fully understand. Here we explicitly make the pipe non-inheritable,
         // which means to pass it to a subprocess they need to be duplicated
-        // first, as in core::run.
+        // first, as in rust_run_program.
         let mut fds = Pipe {in: 0 as c_int,
                     out: 0 as c_int };
         let res = libc::pipe(&mut fds.in, 1024 as ::libc::c_uint,