Skip to content

Commit

Permalink
Update to rustc_test 0.3, unbreak tests on nightly-2018-02-25
Browse files Browse the repository at this point in the history
Version 0.2 of the crates.io package `rustc_test` uses `test` as its
rustc crate name, shadowing the `test` crate from the standard library.
This made up subject to breaking changes to its private APIs:

https://travis-ci.org/SimonSapin/run-nightly/builds/345808272#L549
  • Loading branch information
SimonSapin committed Feb 25, 2018
1 parent 1b84a39 commit 9d500e7
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ harness = false
test = false

[dev-dependencies]
rustc-test = "0.2"
rustc-test = "0.3"
rustc-serialize = "0.3"
serde_json = ">=0.6.1, <0.9"

Expand Down
2 changes: 1 addition & 1 deletion idna/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ harness = false
name = "unit"

[dev-dependencies]
rustc-test = "0.2"
rustc-test = "0.3"
rustc-serialize = "0.3"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion idna/tests/tests.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
extern crate idna;
extern crate rustc_serialize;
extern crate test;
extern crate rustc_test as test;

mod punycode;
mod uts46;
Expand Down
2 changes: 1 addition & 1 deletion idna/tests/uts46.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ fn unescape(input: &str) -> String {
let c2 = chars.next().unwrap().to_digit(16).unwrap();
let c3 = chars.next().unwrap().to_digit(16).unwrap();
let c4 = chars.next().unwrap().to_digit(16).unwrap();
match char::from_u32((((c1 * 16 + c2) * 16 + c3) * 16 + c4))
match char::from_u32(((c1 * 16 + c2) * 16 + c3) * 16 + c4)
{
Some(c) => output.push(c),
None => { output.push_str(&format!("\\u{:X}{:X}{:X}{:X}",c1,c2,c3,c4)); }
Expand Down
2 changes: 1 addition & 1 deletion tests/data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//! Data-driven tests
extern crate rustc_serialize;
extern crate test;
extern crate rustc_test as test;
extern crate url;

use rustc_serialize::json::{self, Json};
Expand Down

0 comments on commit 9d500e7

Please sign in to comment.