Update rustc to revision 3dcd2157403163789aaf21a9ab3c4d30a7c6494d.

This commit is contained in:
Ms2ger 2014-12-17 10:42:52 +01:00 committed by Josh Matthews
parent b8900782b0
commit 466faac2a5
223 changed files with 4414 additions and 4105 deletions

View file

@ -183,8 +183,8 @@ fn parse_lists(file: &Path, servo_args: &[String], render_mode: RenderMode, id_o
};
let kind = match test_line.kind {
"==" => Same,
"!=" => Different,
"==" => ReftestKind::Same,
"!=" => ReftestKind::Different,
part => panic!("reftest line: '{:s}' has invalid kind '{:s}'", line, part)
};
@ -326,11 +326,11 @@ fn check_reftest(reftest: Reftest) {
assert!(res.is_ok());
match (reftest.kind, reftest.is_flaky) {
(Same, true) => println!("flaky test - rendering difference: {}", output_str),
(Same, false) => panic!("rendering difference: {}", output_str),
(Different, _) => {} // Result was different and that's what was expected
(ReftestKind::Same, true) => println!("flaky test - rendering difference: {}", output_str),
(ReftestKind::Same, false) => panic!("rendering difference: {}", output_str),
(ReftestKind::Different, _) => {} // Result was different and that's what was expected
}
} else {
assert!(reftest.is_flaky || reftest.kind == Same);
assert!(reftest.is_flaky || reftest.kind == ReftestKind::Same);
}
}