Auto merge of #285 - servo:testup, r=SimonSapin

Update rustc-test to 0.2, fix breakage on Nightly

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/html5ever/285)
<!-- Reviewable:end -->

Author: bors-servo

html5ever/Cargo.toml

@@ -40,7 +40,7 @@ markup5ever = { version = "0.3", path = "../markup5ever" }
 
 [dev-dependencies]
 rustc-serialize = "0.3.15"
-rustc-test = "0.1.3"
+rustc-test = "0.2"
 
 [build-dependencies]
 quote = "0.3.3"

html5ever/benches/tokenizer.rs

@@ -16,7 +16,6 @@ use std::default::Default;
 
 use test::{black_box, Bencher, TestDesc, TestDescAndFn};
 use test::{DynTestName, DynBenchFn, TDynBenchFn};
-use test::ShouldPanic::No;
 
 use html5ever::tokenizer::{BufferQueue, TokenSink, Token, Tokenizer, TokenizerOpts, TokenSinkResult};
 use html5ever::tendril::*;
@@ -108,17 +107,13 @@ impl TDynBenchFn for Bench {
 fn make_bench(name: &str, size: Option<usize>, clone_only: bool,
               opts: TokenizerOpts) -> TestDescAndFn {
     TestDescAndFn {
-        desc: TestDesc {
-            name: DynTestName([
-                "tokenize ".to_string(),
-                name.to_string(),
-                size.map_or("".to_string(), |s| format!(" size {:7}", s)),
-                (if clone_only { " (clone only)" } else { "" }).to_string(),
-                (if opts.exact_errors { " (exact errors)" } else { "" }).to_string(),
-            ].concat().to_string()),
-            ignore: false,
-            should_panic: No,
-        },
+        desc: TestDesc::new(DynTestName([
+            "tokenize ".to_string(),
+            name.to_string(),
+            size.map_or("".to_string(), |s| format!(" size {:7}", s)),
+            (if clone_only { " (clone only)" } else { "" }).to_string(),
+            (if opts.exact_errors { " (exact errors)" } else { "" }).to_string(),
+        ].concat().to_string())),
         testfn: DynBenchFn(Box::new(Bench::new(name, size, clone_only, opts))),
     }
 }

html5ever/tests/tokenizer.rs

@@ -20,7 +20,6 @@ use std::mem::replace;
 use std::default::Default;
 use std::path::Path;
 use test::{TestDesc, TestDescAndFn, DynTestName, DynTestFn};
-use test::ShouldPanic::No;
 use rustc_serialize::json::Json;
 use std::collections::BTreeMap;
 use std::borrow::Cow::Borrowed;
@@ -314,11 +313,7 @@ fn unescape_json(js: &Json) -> Json {
 fn mk_test(desc: String, input: String, expect: Json, opts: TokenizerOpts)
         -> TestDescAndFn {
     TestDescAndFn {
-        desc: TestDesc {
-            name: DynTestName(desc),
-            ignore: false,
-            should_panic: No,
-        },
+        desc: TestDesc::new(DynTestName(desc)),
         testfn: DynTestFn(Box::new(move || {
             // Split up the input at different points to test incremental tokenization.
             let insplits = splits(&input, 3);

html5ever/tests/tree_builder.rs

@@ -22,7 +22,6 @@ use std::default::Default;
 use std::path::Path;
 use std::collections::{HashSet, HashMap};
 use test::{TestDesc, TestDescAndFn, DynTestName, TestFn};
-use test::ShouldPanic::No;
 
 use html5ever::{LocalName, QualName};
 use html5ever::{ParseOpts, parse_document, parse_fragment};
@@ -199,9 +198,8 @@ fn make_test_desc_with_scripting_flag(
 
     TestDescAndFn {
         desc: TestDesc {
-            name: DynTestName(name),
             ignore: ignore,
-            should_panic: No,
+            .. TestDesc::new(DynTestName(name))
         },
         testfn: TestFn::dyn_test_fn(move || {
             // Do this here because Tendril isn't Send.

xml5ever/Cargo.toml

@@ -29,4 +29,4 @@ markup5ever = {version = "0.3", path = "../markup5ever" }
 
 [dev-dependencies]
 rustc-serialize = "0.3.15"
-rustc-test = "0.1.3"
+rustc-test = "0.2"

xml5ever/tests/tokenizer.rs

@@ -20,7 +20,6 @@ use std::collections::BTreeMap;
 use rustc_serialize::json::Json;
 
 use test::{TestDesc, TestDescAndFn, DynTestName, DynTestFn};
-use test::ShouldPanic::No;
 use util::find_tests::foreach_xml5lib_test;
 
 use xml5ever::{LocalName, Attribute, QualName};
@@ -281,11 +280,7 @@ fn json_to_tokens(js: &Json, exact_errors: bool) -> Vec<Token> {
 fn mk_xml_test(desc: String, input: String, expect: Json, opts: XmlTokenizerOpts)
         -> TestDescAndFn {
     TestDescAndFn {
-        desc: TestDesc {
-            name: DynTestName(desc),
-            ignore: false,
-            should_panic: No,
-        },
+        desc: TestDesc::new(DynTestName(desc)),
         testfn: DynTestFn(Box::new(move || {
             // Split up the input at different points to test incremental tokenization.
             let insplits = splits(&input, 3);

xml5ever/tests/tree_builder.rs

@@ -23,7 +23,6 @@ use std::path::Path;
 
 
 use test::{TestDesc, TestDescAndFn, DynTestName, DynTestFn};
-use test::ShouldPanic::No;
 use util::find_tests::foreach_xml5lib_test;
 use xml5ever::rcdom::*;
 use xml5ever::driver::parse_document;
@@ -186,9 +185,8 @@ fn make_xml_test(
 
     tests.push(TestDescAndFn {
         desc: TestDesc {
-            name: DynTestName(name),
             ignore: ignore,
-            should_panic: No,
+            .. TestDesc::new(DynTestName(name))
         },
         testfn: DynTestFn(Box::new(move || {
             let mut result = String::new();