Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-28 09:40:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #5136 : iamdanfox/servo/replace-uint-with-usize, r=metajack

Browse source 
Clears up some warnings.
This commit is contained in:
bors-servo 2015-03-03 14:24:47 -07:00
commit 0ff54a9773
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/reftest.rs
View file

@ -130,7 +130,7 @@ struct Reftest {
name: String, name: String,
kind: ReftestKind, kind: ReftestKind,
files: [Path; 2], files: [Path; 2],
id: uint, id: usize,
servo_args: Vec<String>, servo_args: Vec<String>,
render_mode: RenderMode, render_mode: RenderMode,
is_flaky: bool, is_flaky: bool,
@ -145,7 +145,7 @@ struct TestLine<'a> {
file_right: &'a str, file_right: &'a str,
} }
fn parse_lists(file: &Path, servo_args: &[String], render_mode: RenderMode, id_offset: uint) -> Vec<TestDescAndFn> { fn parse_lists(file: &Path, servo_args: &[String], render_mode: RenderMode, id_offset: usize) -> Vec<TestDescAndFn> {
let mut tests = Vec::new(); let mut tests = Vec::new();
let contents = File::open_mode(file, io::Open, io::Read) let contents = File::open_mode(file, io::Open, io::Read)
.and_then(|mut f| f.read_to_string()) .and_then(|mut f| f.read_to_string())
@ -240,7 +240,7 @@ fn make_test(reftest: Reftest) -> TestDescAndFn {
} }
} }
fn capture(reftest: &Reftest, side: uint) -> (u32, u32, Vec<u8>) { fn capture(reftest: &Reftest, side: usize) -> (u32, u32, Vec<u8>) {
let png_filename = format!("/tmp/servo-reftest-{:06}-{}.png", reftest.id, side); let png_filename = format!("/tmp/servo-reftest-{:06}-{}.png", reftest.id, side);
let mut command = Command::new(os::self_exe_path().unwrap().join("servo")); let mut command = Command::new(os::self_exe_path().unwrap().join("servo"));
command command