OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #5989 : Thiez/rust/fixbench, r=catamorphism

Browse Source 
Partial fix for #5985
shootout-fasta-redux.rs was calling fwrite with u64 arguments that should have been size_t, which broke on 32-bit systems. I replaced the casts to u64 by casts to size_t.

r?
This commit is contained in:
bors 2013-04-21 11:12:53 -07:00
commit 8942099614
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/bench/shootout-fasta-redux.rs
View File

@ -1,8 +1,6 @@
// xfail-test FIXME #5985 Doesn't typecheck on x86
use core::cast::transmute;
use core::from_str::FromStr;
use core::libc::{FILE, STDOUT_FILENO, c_int, fdopen, fputc, fputs, fwrite};
use core::libc::{FILE, STDOUT_FILENO, c_int, fdopen, fputc, fputs, fwrite, size_t};
use core::uint::{min, range};
use core::vec::bytes::copy_memory;
@ -101,7 +99,7 @@ impl RepeatFasta {
let mut pos = 0, bytes, n = n;
while n > 0 {
bytes = min(LINE_LEN, n);
fwrite(transmute(&buf[pos]), bytes as u64, 1, stdout);
fwrite(transmute(&buf[pos]), bytes as size_t, 1, stdout);
fputc('\n' as c_int, stdout);
pos += bytes;
if pos > alu_len {
@ -166,14 +164,14 @@ impl RandomFasta {
}
buf[LINE_LEN] = '\n' as u8;
fwrite(transmute(&buf[0]),
LINE_LEN as u64 + 1,
LINE_LEN as size_t + 1,
1,
self.stdout);
}
for range(0, chars_left) |i| {
buf[i] = self.nextc();
}
fwrite(transmute(&buf[0]), chars_left as u64, 1, self.stdout);
fwrite(transmute(&buf[0]), chars_left as size_t, 1, self.stdout);
}
}
}