Skip to content

Commit 1034935

Browse files
garethgareth
gareth
authored and
gareth
committed
---
yaml --- r: 57151 b: refs/heads/try c: 91aeecf h: refs/heads/master i: 57149: 48ecd79 57147: 6f537aa 57143: 5f28718 57135: 12369f4 57119: 3c0b257 57087: f0c040f v: v3
1 parent 45865d4 commit 1034935

File tree

9 files changed

+120
-99
lines changed

9 files changed

+120
-99
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: c081ffbd1e845687202a975ea2e698b623e5722f
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
5-
refs/heads/try: 0b90493f7e49cd575dfeddd6c0a7a27911cd4ed3
5+
refs/heads/try: 91aeecf7e38e01a9e323683c39649e201a9f726c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

‎branches/try/src/libcore/libc.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1725,6 +1725,7 @@ pub mod funcs {
17251725
findFileData: HANDLE)
17261726
-> BOOL;
17271727
unsafe fn FindClose(findFile: HANDLE) -> BOOL;
1728+
unsafe fn CloseHandle(hObject: HANDLE) -> BOOL;
17281729
unsafe fn TerminateProcess(hProcess: HANDLE, uExitCode: c_uint) -> BOOL;
17291730
}
17301731
}

‎branches/try/src/libcore/num/f32.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -301,53 +301,40 @@ impl num::One for f32 {
301301

302302
#[cfg(notest)]
303303
impl Add<f32,f32> for f32 {
304-
#[inline(always)]
305304
fn add(&self, other: &f32) -> f32 { *self + *other }
306305
}
307-
308306
#[cfg(notest)]
309307
impl Sub<f32,f32> for f32 {
310-
#[inline(always)]
311308
fn sub(&self, other: &f32) -> f32 { *self - *other }
312309
}
313-
314310
#[cfg(notest)]
315311
impl Mul<f32,f32> for f32 {
316-
#[inline(always)]
317312
fn mul(&self, other: &f32) -> f32 { *self * *other }
318313
}
319-
320314
#[cfg(stage0,notest)]
321315
impl Div<f32,f32> for f32 {
322-
#[inline(always)]
323316
fn div(&self, other: &f32) -> f32 { *self / *other }
324317
}
325-
326318
#[cfg(stage1,notest)]
327319
#[cfg(stage2,notest)]
328320
#[cfg(stage3,notest)]
329321
impl Quot<f32,f32> for f32 {
330322
#[inline(always)]
331323
fn quot(&self, other: &f32) -> f32 { *self / *other }
332324
}
333-
334325
#[cfg(stage0,notest)]
335326
impl Modulo<f32,f32> for f32 {
336-
#[inline(always)]
337327
fn modulo(&self, other: &f32) -> f32 { *self % *other }
338328
}
339-
340329
#[cfg(stage1,notest)]
341330
#[cfg(stage2,notest)]
342331
#[cfg(stage3,notest)]
343332
impl Rem<f32,f32> for f32 {
344333
#[inline(always)]
345334
fn rem(&self, other: &f32) -> f32 { *self % *other }
346335
}
347-
348336
#[cfg(notest)]
349337
impl Neg<f32> for f32 {
350-
#[inline(always)]
351338
fn neg(&self) -> f32 { -*self }
352339
}
353340

‎branches/try/src/libcore/num/float.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -455,25 +455,18 @@ impl num::Round for float {
455455
456456
#[cfg(notest)]
457457
impl Add<float,float> for float {
458-
#[inline(always)]
459458
fn add(&self, other: &float) -> float { *self + *other }
460459
}
461-
462460
#[cfg(notest)]
463461
impl Sub<float,float> for float {
464-
#[inline(always)]
465462
fn sub(&self, other: &float) -> float { *self - *other }
466463
}
467-
468464
#[cfg(notest)]
469465
impl Mul<float,float> for float {
470-
#[inline(always)]
471466
fn mul(&self, other: &float) -> float { *self * *other }
472467
}
473-
474468
#[cfg(stage0,notest)]
475469
impl Div<float,float> for float {
476-
#[inline(always)]
477470
fn div(&self, other: &float) -> float { *self / *other }
478471
}
479472
#[cfg(stage1,notest)]
@@ -485,7 +478,6 @@ impl Quot<float,float> for float {
485478
}
486479
#[cfg(stage0,notest)]
487480
impl Modulo<float,float> for float {
488-
#[inline(always)]
489481
fn modulo(&self, other: &float) -> float { *self % *other }
490482
}
491483
#[cfg(stage1,notest)]
@@ -497,7 +489,6 @@ impl Rem<float,float> for float {
497489
}
498490
#[cfg(notest)]
499491
impl Neg<float> for float {
500-
#[inline(always)]
501492
fn neg(&self) -> float { -*self }
502493
}
503494

‎branches/try/src/libcore/num/int-template.rs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -175,53 +175,40 @@ impl num::One for T {
175175
176176
#[cfg(notest)]
177177
impl Add<T,T> for T {
178-
#[inline(always)]
179178
fn add(&self, other: &T) -> T { *self + *other }
180179
}
181-
182180
#[cfg(notest)]
183181
impl Sub<T,T> for T {
184-
#[inline(always)]
185182
fn sub(&self, other: &T) -> T { *self - *other }
186183
}
187-
188184
#[cfg(notest)]
189185
impl Mul<T,T> for T {
190-
#[inline(always)]
191186
fn mul(&self, other: &T) -> T { *self * *other }
192187
}
193-
194188
#[cfg(stage0,notest)]
195189
impl Div<T,T> for T {
196-
#[inline(always)]
197190
fn div(&self, other: &T) -> T { *self / *other }
198191
}
199-
200192
#[cfg(stage1,notest)]
201193
#[cfg(stage2,notest)]
202194
#[cfg(stage3,notest)]
203195
impl Quot<T,T> for T {
204196
#[inline(always)]
205197
fn quot(&self, other: &T) -> T { *self / *other }
206198
}
207-
208199
#[cfg(stage0,notest)]
209200
impl Modulo<T,T> for T {
210-
#[inline(always)]
211201
fn modulo(&self, other: &T) -> T { *self % *other }
212202
}
213-
214203
#[cfg(stage1,notest)]
215204
#[cfg(stage2,notest)]
216205
#[cfg(stage3,notest)]
217206
impl Rem<T,T> for T {
218207
#[inline(always)]
219208
fn rem(&self, other: &T) -> T { *self % *other }
220209
}
221-
222210
#[cfg(notest)]
223211
impl Neg<T> for T {
224-
#[inline(always)]
225212
fn neg(&self) -> T { -*self }
226213
}
227214
@@ -230,31 +217,26 @@ impl BitOr<T,T> for T {
230217
#[inline(always)]
231218
fn bitor(&self, other: &T) -> T { *self | *other }
232219
}
233-
234220
#[cfg(notest)]
235221
impl BitAnd<T,T> for T {
236222
#[inline(always)]
237223
fn bitand(&self, other: &T) -> T { *self & *other }
238224
}
239-
240225
#[cfg(notest)]
241226
impl BitXor<T,T> for T {
242227
#[inline(always)]
243228
fn bitxor(&self, other: &T) -> T { *self ^ *other }
244229
}
245-
246230
#[cfg(notest)]
247231
impl Shl<T,T> for T {
248232
#[inline(always)]
249233
fn shl(&self, other: &T) -> T { *self << *other }
250234
}
251-
252235
#[cfg(notest)]
253236
impl Shr<T,T> for T {
254237
#[inline(always)]
255238
fn shr(&self, other: &T) -> T { *self >> *other }
256239
}
257-
258240
#[cfg(notest)]
259241
impl Not<T> for T {
260242
#[inline(always)]

‎branches/try/src/libcore/num/uint-template.rs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -140,53 +140,40 @@ impl num::One for T {
140140
141141
#[cfg(notest)]
142142
impl Add<T,T> for T {
143-
#[inline(always)]
144143
fn add(&self, other: &T) -> T { *self + *other }
145144
}
146-
147145
#[cfg(notest)]
148146
impl Sub<T,T> for T {
149-
#[inline(always)]
150147
fn sub(&self, other: &T) -> T { *self - *other }
151148
}
152-
153149
#[cfg(notest)]
154150
impl Mul<T,T> for T {
155-
#[inline(always)]
156151
fn mul(&self, other: &T) -> T { *self * *other }
157152
}
158-
159153
#[cfg(stage0,notest)]
160154
impl Div<T,T> for T {
161-
#[inline(always)]
162155
fn div(&self, other: &T) -> T { *self / *other }
163156
}
164-
165157
#[cfg(stage1,notest)]
166158
#[cfg(stage2,notest)]
167159
#[cfg(stage3,notest)]
168160
impl Quot<T,T> for T {
169161
#[inline(always)]
170162
fn quot(&self, other: &T) -> T { *self / *other }
171163
}
172-
173164
#[cfg(stage0,notest)]
174165
impl Modulo<T,T> for T {
175-
#[inline(always)]
176166
fn modulo(&self, other: &T) -> T { *self % *other }
177167
}
178-
179168
#[cfg(stage1,notest)]
180169
#[cfg(stage2,notest)]
181170
#[cfg(stage3,notest)]
182171
impl Rem<T,T> for T {
183172
#[inline(always)]
184173
fn rem(&self, other: &T) -> T { *self % *other }
185174
}
186-
187175
#[cfg(notest)]
188176
impl Neg<T> for T {
189-
#[inline(always)]
190177
fn neg(&self) -> T { -*self }
191178
}
192179
@@ -195,31 +182,26 @@ impl BitOr<T,T> for T {
195182
#[inline(always)]
196183
fn bitor(&self, other: &T) -> T { *self | *other }
197184
}
198-
199185
#[cfg(notest)]
200186
impl BitAnd<T,T> for T {
201187
#[inline(always)]
202188
fn bitand(&self, other: &T) -> T { *self & *other }
203189
}
204-
205190
#[cfg(notest)]
206191
impl BitXor<T,T> for T {
207192
#[inline(always)]
208193
fn bitxor(&self, other: &T) -> T { *self ^ *other }
209194
}
210-
211195
#[cfg(notest)]
212196
impl Shl<T,T> for T {
213197
#[inline(always)]
214198
fn shl(&self, other: &T) -> T { *self << *other }
215199
}
216-
217200
#[cfg(notest)]
218201
impl Shr<T,T> for T {
219202
#[inline(always)]
220203
fn shr(&self, other: &T) -> T { *self >> *other }
221204
}
222-
223205
#[cfg(notest)]
224206
impl Not<T> for T {
225207
#[inline(always)]

‎branches/try/src/libcore/os.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ pub mod rustrt {
6060
unsafe fn rust_get_argv() -> **c_char;
6161
unsafe fn rust_path_is_dir(path: *libc::c_char) -> c_int;
6262
unsafe fn rust_path_exists(path: *libc::c_char) -> c_int;
63-
unsafe fn rust_process_wait(handle: c_int) -> c_int;
63+
unsafe fn rust_process_wait(pid: c_int) -> c_int;
6464
unsafe fn rust_set_exit_status(code: libc::intptr_t);
6565
}
6666
}
@@ -356,7 +356,11 @@ pub fn fsync_fd(fd: c_int, _l: io::fsync::Level) -> c_int {
356356
#[cfg(windows)]
357357
pub fn waitpid(pid: pid_t) -> c_int {
358358
unsafe {
359-
return rustrt::rust_process_wait(pid);
359+
let status = rustrt::rust_process_wait(pid);
360+
if status < 0 {
361+
fail!(fmt!("failure in rust_process_wait: %s", last_os_error()));
362+
}
363+
return status;
360364
}
361365
}
362366

0 commit comments

Comments
 (0)