Skip to content

Commit 8ac863c

Browse files
alexcrichtonalexcrichton
committed
---
yaml --- r: 146555 b: refs/heads/try2 c: 7407bcc h: refs/heads/master i: 146553: 907ef74 146551: da3abb5 v: v3
1 parent 7f5c541 commit 8ac863c

File tree

14 files changed

+28
-247
lines changed

14 files changed

+28
-247
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 63cfc9989d62e0047c2f9597d2b2283717397dea
8+
refs/heads/try2: 7407bcc1a2aa46949d3dadd1d9b79c76ad18d4cf
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
*.cps
3131
*.log
3232
*.pdf
33-
*.epub
3433
*.html
3534
*.pg
3635
*.toc

‎branches/try2/mk/clean.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ clean-misc:
5353
$(Q)rm -Rf tmp/*
5454
$(Q)rm -Rf rust-stage0-*.tar.bz2 $(PKG_NAME)-*.tar.gz dist
5555
$(Q)rm -Rf $(foreach ext, \
56-
html aux cp fn ky log pdf pg toc tp vr cps epub, \
56+
html aux cp fn ky log pdf pg toc tp vr cps, \
5757
$(wildcard doc/*.$(ext)))
5858
$(Q)find doc/std doc/extra -mindepth 1 | xargs rm -Rf
5959
$(Q)rm -Rf doc/version.md

‎branches/try2/mk/docs.mk

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,6 @@ doc/rust.tex: rust.md doc/version.md
6464
--from=markdown --to=latex \
6565
--output=$@
6666

67-
DOCS += doc/rust.epub
68-
doc/rust.epub: rust.md doc/version_info.html doc/rust.css doc/manual.inc
69-
@$(call E, pandoc: $@)
70-
$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
71-
"$(CFG_PANDOC)" \
72-
--standalone --toc \
73-
--section-divs \
74-
--number-sections \
75-
--from=markdown --to=epub \
76-
--css=rust.css --include-in-header=doc/manual.inc \
77-
--include-before-body=doc/version_info.html \
78-
--output=$@
79-
80-
8167
DOCS += doc/tutorial.tex
8268
doc/tutorial.tex: tutorial.md doc/version.md
8369
@$(call E, pandoc: $@)
@@ -112,17 +98,6 @@ doc/tutorial.html: tutorial.md doc/version_info.html doc/rust.css
11298
--include-before-body=doc/version_info.html \
11399
--output=$@
114100

115-
DOCS += doc/tutorial.epub
116-
doc/tutorial.epub: tutorial.md doc/version_info.html doc/rust.css
117-
@$(call E, pandoc: $@)
118-
$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
119-
$(CFG_PANDOC) --standalone --toc \
120-
--section-divs --number-sections \
121-
--from=markdown --to=epub --css=rust.css \
122-
--include-before-body=doc/version_info.html \
123-
--output=$@
124-
125-
126101
DOCS_L10N += doc/l10n/ja/tutorial.html
127102
doc/l10n/ja/tutorial.html: doc/l10n/ja/tutorial.md doc/version_info.html doc/rust.css
128103
@$(call E, pandoc: $@)

‎branches/try2/src/libextra/getopts.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,7 @@ pub struct Matches {
142142
}
143143

144144
/// The type returned when the command line does not conform to the
145-
/// expected format. Call the `to_err_msg` method to retrieve the
146-
/// error as a string.
145+
/// expected format. Pass this value to <fail_str> to get an error message.
147146
#[deriving(Clone, Eq, ToStr)]
148147
#[allow(missing_doc)]
149148
pub enum Fail_ {

‎branches/try2/src/libstd/libc.rs

Lines changed: 1 addition & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -3387,8 +3387,7 @@ pub mod funcs {
33873387
LPSYSTEM_INFO};
33883388
use libc::types::os::arch::extra::{HANDLE, LPHANDLE};
33893389

3390-
#[cfg(target_arch = "x86")]
3391-
extern "stdcall" {
3390+
extern "system" {
33923391
pub fn GetEnvironmentVariableW(n: LPCWSTR,
33933392
v: LPWSTR,
33943393
nsize: DWORD)
@@ -3494,114 +3493,6 @@ pub mod funcs {
34943493
-> LPVOID;
34953494
pub fn UnmapViewOfFile(lpBaseAddress: LPCVOID) -> BOOL;
34963495
}
3497-
3498-
#[cfg(target_arch = "x86_64")]
3499-
extern {
3500-
pub fn GetEnvironmentVariableW(n: LPCWSTR,
3501-
v: LPWSTR,
3502-
nsize: DWORD)
3503-
-> DWORD;
3504-
pub fn SetEnvironmentVariableW(n: LPCWSTR, v: LPCWSTR)
3505-
-> BOOL;
3506-
pub fn GetEnvironmentStringsA() -> LPTCH;
3507-
pub fn FreeEnvironmentStringsA(env_ptr: LPTCH) -> BOOL;
3508-
pub fn GetModuleFileNameW(hModule: HMODULE,
3509-
lpFilename: LPWSTR,
3510-
nSize: DWORD)
3511-
-> DWORD;
3512-
pub fn CreateDirectoryW(lpPathName: LPCWSTR,
3513-
lpSecurityAttributes:
3514-
LPSECURITY_ATTRIBUTES)
3515-
-> BOOL;
3516-
pub fn CopyFileW(lpExistingFileName: LPCWSTR,
3517-
lpNewFileName: LPCWSTR,
3518-
bFailIfExists: BOOL)
3519-
-> BOOL;
3520-
pub fn DeleteFileW(lpPathName: LPCWSTR) -> BOOL;
3521-
pub fn RemoveDirectoryW(lpPathName: LPCWSTR) -> BOOL;
3522-
pub fn GetCurrentDirectoryW(nBufferLength: DWORD,
3523-
lpBuffer: LPWSTR)
3524-
-> DWORD;
3525-
pub fn SetCurrentDirectoryW(lpPathName: LPCWSTR) -> BOOL;
3526-
pub fn GetLastError() -> DWORD;
3527-
pub fn FindFirstFileW(fileName: *u16, findFileData: HANDLE)
3528-
-> HANDLE;
3529-
pub fn FindNextFileW(findFile: HANDLE, findFileData: HANDLE)
3530-
-> BOOL;
3531-
pub fn FindClose(findFile: HANDLE) -> BOOL;
3532-
pub fn DuplicateHandle(hSourceProcessHandle: HANDLE,
3533-
hSourceHandle: HANDLE,
3534-
hTargetProcessHandle: HANDLE,
3535-
lpTargetHandle: LPHANDLE,
3536-
dwDesiredAccess: DWORD,
3537-
bInheritHandle: BOOL,
3538-
dwOptions: DWORD)
3539-
-> BOOL;
3540-
pub fn CloseHandle(hObject: HANDLE) -> BOOL;
3541-
pub fn OpenProcess(dwDesiredAccess: DWORD,
3542-
bInheritHandle: BOOL,
3543-
dwProcessId: DWORD)
3544-
-> HANDLE;
3545-
pub fn GetCurrentProcess() -> HANDLE;
3546-
pub fn CreateProcessA(lpApplicationName: LPCTSTR,
3547-
lpCommandLine: LPTSTR,
3548-
lpProcessAttributes:
3549-
LPSECURITY_ATTRIBUTES,
3550-
lpThreadAttributes:
3551-
LPSECURITY_ATTRIBUTES,
3552-
bInheritHandles: BOOL,
3553-
dwCreationFlags: DWORD,
3554-
lpEnvironment: LPVOID,
3555-
lpCurrentDirectory: LPCTSTR,
3556-
lpStartupInfo: LPSTARTUPINFO,
3557-
lpProcessInformation:
3558-
LPPROCESS_INFORMATION)
3559-
-> BOOL;
3560-
pub fn WaitForSingleObject(hHandle: HANDLE,
3561-
dwMilliseconds: DWORD)
3562-
-> DWORD;
3563-
pub fn TerminateProcess(hProcess: HANDLE, uExitCode: c_uint)
3564-
-> BOOL;
3565-
pub fn GetExitCodeProcess(hProcess: HANDLE,
3566-
lpExitCode: LPDWORD)
3567-
-> BOOL;
3568-
pub fn GetSystemInfo(lpSystemInfo: LPSYSTEM_INFO);
3569-
pub fn VirtualAlloc(lpAddress: LPVOID,
3570-
dwSize: SIZE_T,
3571-
flAllocationType: DWORD,
3572-
flProtect: DWORD)
3573-
-> LPVOID;
3574-
pub fn VirtualFree(lpAddress: LPVOID,
3575-
dwSize: SIZE_T,
3576-
dwFreeType: DWORD)
3577-
-> BOOL;
3578-
pub fn VirtualLock(lpAddress: LPVOID, dwSize: SIZE_T) -> BOOL;
3579-
pub fn VirtualUnlock(lpAddress: LPVOID, dwSize: SIZE_T)
3580-
-> BOOL;
3581-
pub fn VirtualProtect(lpAddress: LPVOID,
3582-
dwSize: SIZE_T,
3583-
flNewProtect: DWORD,
3584-
lpflOldProtect: LPDWORD)
3585-
-> BOOL;
3586-
pub fn VirtualQuery(lpAddress: LPCVOID,
3587-
lpBuffer: LPMEMORY_BASIC_INFORMATION,
3588-
dwLength: SIZE_T)
3589-
-> SIZE_T;
3590-
pub fn CreateFileMappingW(hFile: HANDLE,
3591-
lpAttributes: LPSECURITY_ATTRIBUTES,
3592-
flProtect: DWORD,
3593-
dwMaximumSizeHigh: DWORD,
3594-
dwMaximumSizeLow: DWORD,
3595-
lpName: LPCTSTR)
3596-
-> HANDLE;
3597-
pub fn MapViewOfFile(hFileMappingObject: HANDLE,
3598-
dwDesiredAccess: DWORD,
3599-
dwFileOffsetHigh: DWORD,
3600-
dwFileOffsetLow: DWORD,
3601-
dwNumberOfBytesToMap: SIZE_T)
3602-
-> LPVOID;
3603-
pub fn UnmapViewOfFile(lpBaseAddress: LPCVOID) -> BOOL;
3604-
}
36053496
}
36063497

36073498
pub mod msvcrt {

‎branches/try2/src/libstd/os.rs

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -615,15 +615,8 @@ pub fn errno() -> uint {
615615
#[fixed_stack_segment]; #[inline(never)];
616616
use libc::types::os::arch::extra::DWORD;
617617

618-
#[cfg(target_arch = "x86")]
619-
#[link_name = "kernel32"]
620-
extern "stdcall" {
621-
fn GetLastError() -> DWORD;
622-
}
623-
624-
#[cfg(target_arch = "x86_64")]
625618
#[link_name = "kernel32"]
626-
extern {
619+
extern "system" {
627620
fn GetLastError() -> DWORD;
628621
}
629622

@@ -693,22 +686,8 @@ pub fn last_os_error() -> ~str {
693686
use libc::types::os::arch::extra::LPVOID;
694687
use libc::types::os::arch::extra::WCHAR;
695688

696-
#[cfg(target_arch = "x86")]
697689
#[link_name = "kernel32"]
698-
extern "stdcall" {
699-
fn FormatMessageW(flags: DWORD,
700-
lpSrc: LPVOID,
701-
msgId: DWORD,
702-
langId: DWORD,
703-
buf: LPWSTR,
704-
nsize: DWORD,
705-
args: *c_void)
706-
-> DWORD;
707-
}
708-
709-
#[cfg(target_arch = "x86_64")]
710-
#[link_name = "kernel32"]
711-
extern {
690+
extern "system" {
712691
fn FormatMessageW(flags: DWORD,
713692
lpSrc: LPVOID,
714693
msgId: DWORD,
@@ -833,31 +812,16 @@ fn real_args() -> ~[~str] {
833812

834813
type LPCWSTR = *u16;
835814

836-
#[cfg(windows, target_arch = "x86")]
815+
#[cfg(windows)]
837816
#[link_name="kernel32"]
838-
#[abi="stdcall"]
839-
extern "stdcall" {
817+
extern "system" {
840818
fn GetCommandLineW() -> LPCWSTR;
841819
fn LocalFree(ptr: *c_void);
842820
}
843821

844-
#[cfg(windows, target_arch = "x86_64")]
845-
#[link_name="kernel32"]
846-
extern {
847-
fn GetCommandLineW() -> LPCWSTR;
848-
fn LocalFree(ptr: *c_void);
849-
}
850-
851-
#[cfg(windows, target_arch = "x86")]
852-
#[link_name="shell32"]
853-
#[abi="stdcall"]
854-
extern "stdcall" {
855-
fn CommandLineToArgvW(lpCmdLine: LPCWSTR, pNumArgs: *mut c_int) -> **u16;
856-
}
857-
858-
#[cfg(windows, target_arch = "x86_64")]
822+
#[cfg(windows)]
859823
#[link_name="shell32"]
860-
extern {
824+
extern "system" {
861825
fn CommandLineToArgvW(lpCmdLine: LPCWSTR, pNumArgs: *mut c_int) -> **u16;
862826
}
863827

‎branches/try2/src/libstd/rt/thread.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,8 @@ impl Drop for Thread {
118118
}
119119
}
120120

121-
#[cfg(windows, target_arch = "x86")]
122-
extern "stdcall" {
123-
fn CreateThread(lpThreadAttributes: LPSECURITY_ATTRIBUTES, dwStackSize: SIZE_T,
124-
lpStartAddress: extern "C" fn(*libc::c_void) -> rust_thread_return,
125-
lpParameter: LPVOID, dwCreationFlags: DWORD, lpThreadId: LPDWORD) -> HANDLE;
126-
fn WaitForSingleObject(hHandle: HANDLE, dwMilliseconds: DWORD) -> DWORD;
127-
}
128-
129-
#[cfg(windows, target_arch = "x86_64")]
130-
extern {
121+
#[cfg(windows)]
122+
extern "system" {
131123
fn CreateThread(lpThreadAttributes: LPSECURITY_ATTRIBUTES, dwStackSize: SIZE_T,
132124
lpStartAddress: extern "C" fn(*libc::c_void) -> rust_thread_return,
133125
lpParameter: LPVOID, dwCreationFlags: DWORD, lpThreadId: LPDWORD) -> HANDLE;

‎branches/try2/src/libstd/rt/thread_local_storage.rs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ pub unsafe fn get(key: Key) -> *mut c_void {
8888
TlsGetValue(key)
8989
}
9090

91-
#[cfg(windows, target_arch = "x86")]
92-
extern "stdcall" {
91+
#[cfg(windows)]
92+
extern "system" {
9393
fn TlsAlloc() -> DWORD;
9494

9595
// See the reasoning in pthread_getspecific as to why this has the
@@ -101,17 +101,6 @@ extern "stdcall" {
101101
fn TlsSetValue(dwTlsIndex: DWORD, lpTlsvalue: LPVOID) -> BOOL;
102102
}
103103

104-
#[cfg(windows, target_arch = "x86_64")]
105-
extern {
106-
fn TlsAlloc() -> DWORD;
107-
108-
// See above.
109-
#[rust_stack]
110-
fn TlsGetValue(dwTlsIndex: DWORD) -> LPVOID;
111-
#[rust_stack]
112-
fn TlsSetValue(dwTlsIndex: DWORD, lpTlsvalue: LPVOID) -> BOOL;
113-
}
114-
115104
#[test]
116105
fn tls_smoke_test() {
117106
use cast::transmute;

‎branches/try2/src/libstd/task/spawn.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -661,6 +661,7 @@ pub fn spawn_raw(mut opts: TaskOpts, f: ~fn()) {
661661
};
662662
new_sched.bootstrap(bootstrap_task);
663663

664+
debug!("enqueing join_task");
664665
// Now tell the original scheduler to join with this thread
665666
// by scheduling a thread-joining task on the original scheduler
666667
orig_sched_handle.send(TaskFromFriend(join_task));

‎branches/try2/src/libstd/unstable/dynamic_lib.rs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -264,20 +264,8 @@ pub mod dl {
264264
FreeLibrary(handle); ()
265265
}
266266

267-
#[cfg(target_arch = "x86")]
268267
#[link_name = "kernel32"]
269-
extern "stdcall" {
270-
fn SetLastError(error: u32);
271-
fn LoadLibraryW(name: *u16) -> *libc::c_void;
272-
fn GetModuleHandleExW(dwFlags: libc::DWORD, name: *u16,
273-
handle: **libc::c_void) -> *libc::c_void;
274-
fn GetProcAddress(handle: *libc::c_void, name: *libc::c_char) -> *libc::c_void;
275-
fn FreeLibrary(handle: *libc::c_void);
276-
}
277-
278-
#[cfg(target_arch = "x86_64")]
279-
#[link_name = "kernel32"]
280-
extern {
268+
extern "system" {
281269
fn SetLastError(error: u32);
282270
fn LoadLibraryW(name: *u16) -> *libc::c_void;
283271
fn GetModuleHandleExW(dwFlags: libc::DWORD, name: *u16,

‎branches/try2/src/snapshots.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
S 2013-11-10 b5e602a
2+
freebsd-x86_64 bdcfcfa63216559765b83fe4056abb953da25da0
3+
linux-i386 0fb5cdff8a46e9a02bcdba100803bb5504b6f332
4+
linux-x86_64 fe861214208cacef085bfc13c22ce655c207facc
5+
macos-i386 83d7853554e5d5404227924cc3cbf86c673f4626
6+
macos-x86_64 27a71031d9030057746199a3c82efac8f8607093
7+
winnt-i386 d1a0e2a3cfbc09e360aa0ac4f47b3e8a638b39f7
8+
19
S 2013-11-06 fdc830d
210
freebsd-x86_64 ef38f3acf8d05eda3c9f21e75c2bbd2f90a614a3
311
linux-i386 6ad20f6722c15a71fe7654d187dc431e26c1da6f

‎branches/try2/src/test/run-pass/spawning-with-debug.rs

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)