Skip to content

Commit

Permalink
uint -> usize
Browse files Browse the repository at this point in the history
  • Loading branch information
iamdanfox committed Mar 3, 2015
1 parent 4c1d778 commit 522b0ea
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tests/reftest.rs
Expand Up @@ -130,7 +130,7 @@ struct Reftest {
name: String,
kind: ReftestKind,
files: [Path; 2],
id: uint,
id: usize,
servo_args: Vec<String>,
render_mode: RenderMode,
is_flaky: bool,
Expand All @@ -145,7 +145,7 @@ struct TestLine<'a> {
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 contents = File::open_mode(file, io::Open, io::Read)
.and_then(|mut f| f.read_to_string())
Expand Down Expand Up @@ -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 mut command = Command::new(os::self_exe_path().unwrap().join("servo"));
command
Expand Down

5 comments on commit 522b0ea

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from metajack
at iamdanfox@522b0ea

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging iamdanfox/servo/replace-uint-with-usize = 522b0ea into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iamdanfox/servo/replace-uint-with-usize = 522b0ea merged ok, testing candidate = 0ff54a9

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 0ff54a9

Please sign in to comment.