Skip to content

Commit 04d5ec1

Browse files
author
bors-servo
authored
Auto merge of #439 - servo:test, r=emilio
Update to rustc_test 0.3, unbreak tests on nightly-2018-02-25 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 <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-url/439) <!-- Reviewable:end -->
2 parents 1b84a39 + 9d500e7 commit 04d5ec1

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ harness = false
3131
test = false
3232

3333
[dev-dependencies]
34-
rustc-test = "0.2"
34+
rustc-test = "0.3"
3535
rustc-serialize = "0.3"
3636
serde_json = ">=0.6.1, <0.9"
3737

idna/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ harness = false
1818
name = "unit"
1919

2020
[dev-dependencies]
21-
rustc-test = "0.2"
21+
rustc-test = "0.3"
2222
rustc-serialize = "0.3"
2323

2424
[dependencies]

idna/tests/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extern crate idna;
22
extern crate rustc_serialize;
3-
extern crate test;
3+
extern crate rustc_test as test;
44

55
mod punycode;
66
mod uts46;

idna/tests/uts46.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ fn unescape(input: &str) -> String {
108108
let c2 = chars.next().unwrap().to_digit(16).unwrap();
109109
let c3 = chars.next().unwrap().to_digit(16).unwrap();
110110
let c4 = chars.next().unwrap().to_digit(16).unwrap();
111-
match char::from_u32((((c1 * 16 + c2) * 16 + c3) * 16 + c4))
111+
match char::from_u32(((c1 * 16 + c2) * 16 + c3) * 16 + c4)
112112
{
113113
Some(c) => output.push(c),
114114
None => { output.push_str(&format!("\\u{:X}{:X}{:X}{:X}",c1,c2,c3,c4)); }

tests/data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//! Data-driven tests
1010
1111
extern crate rustc_serialize;
12-
extern crate test;
12+
extern crate rustc_test as test;
1313
extern crate url;
1414

1515
use rustc_serialize::json::{self, Json};

0 commit comments

Comments
 (0)