diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/reftest.rs | 3 | ||||
-rw-r--r-- | tests/unit/net/Cargo.toml | 6 | ||||
-rw-r--r-- | tests/unit/plugin/Cargo.toml | 4 | ||||
-rw-r--r-- | tests/unit/style/Cargo.toml | 2 | ||||
-rw-r--r-- | tests/unit/util/Cargo.toml | 2 | ||||
-rw-r--r-- | tests/unit/util/mem.rs | 5 | ||||
-rw-r--r-- | tests/wpt/metadata/url/url-constructor.html.ini | 13 |
7 files changed, 8 insertions, 27 deletions
diff --git a/tests/reftest.rs b/tests/reftest.rs index 5008414be4f..b37bbcbfdf5 100644 --- a/tests/reftest.rs +++ b/tests/reftest.rs @@ -8,7 +8,6 @@ // except according to those terms. #![feature(fs_walk)] -#![feature(path_ext)] #![feature(slice_patterns)] #![feature(test)] @@ -21,7 +20,7 @@ extern crate util; use image::{DynamicImage, GenericImage, ImageFormat, RgbImage}; use std::env; use std::ffi::OsStr; -use std::fs::{PathExt, File, walk_dir}; +use std::fs::{File, walk_dir}; use std::io::{self, Read, Result, Write}; use std::path::{Path, PathBuf}; use std::process; diff --git a/tests/unit/net/Cargo.toml b/tests/unit/net/Cargo.toml index 39abd0ee00b..28045b73721 100644 --- a/tests/unit/net/Cargo.toml +++ b/tests/unit/net/Cargo.toml @@ -30,8 +30,8 @@ path = "../../../components/devtools_traits" git = "https://github.com/servo/ipc-channel" [dependencies] -cookie = "0.1" -hyper = "0.6" -url = "0.2" +cookie = "0.2" +hyper = "0.7" +url = "0.5" time = "0.1" flate2 = "0.2.0" diff --git a/tests/unit/plugin/Cargo.toml b/tests/unit/plugin/Cargo.toml index 3ea2ebd8672..0289202e72d 100644 --- a/tests/unit/plugin/Cargo.toml +++ b/tests/unit/plugin/Cargo.toml @@ -11,5 +11,5 @@ doctest = false [dependencies.plugins] path = "../../../components/plugins" -[dependencies.url] -version = "0.2.36" +[dependencies] +url = "0.5" diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml index 6073bd96246..b16c975b201 100644 --- a/tests/unit/style/Cargo.toml +++ b/tests/unit/style/Cargo.toml @@ -22,7 +22,7 @@ path = "../../../components/util" [dependencies] app_units = {version = "0.1", features = ["plugins"]} -url = "0.2" +url = "0.5" cssparser = "0.4" selectors = "0.2" string_cache = "0.2" diff --git a/tests/unit/util/Cargo.toml b/tests/unit/util/Cargo.toml index 7956a907cfa..d30bb9c0972 100644 --- a/tests/unit/util/Cargo.toml +++ b/tests/unit/util/Cargo.toml @@ -17,6 +17,6 @@ path = "../../../components/plugins" [dependencies] app_units = {version = "0.1", features = ["plugins"]} -libc = "0.1" +libc = "0.2" euclid = {version = "0.3", features = ["plugins"]} diff --git a/tests/unit/util/mem.rs b/tests/unit/util/mem.rs index 4afbda00836..9b9ac4729e1 100644 --- a/tests/unit/util/mem.rs +++ b/tests/unit/util/mem.rs @@ -66,11 +66,6 @@ fn test_heap_size() { // An ascii string with 16 chars is 16 bytes in UTF-8. assert_eq!(String::from("0123456789abcdef").heap_size_of_children(), 16); - // … but RawVec::reserve gives twice the requested capacity. - let mut x = String::new(); - x.push_str("0123456789abcdef"); - assert_eq!(x.heap_size_of_children(), 32); - // Not on the heap. let x: Option<i32> = None; assert_eq!(x.heap_size_of_children(), 0); diff --git a/tests/wpt/metadata/url/url-constructor.html.ini b/tests/wpt/metadata/url/url-constructor.html.ini index 084c2509dc1..549c68258ad 100644 --- a/tests/wpt/metadata/url/url-constructor.html.ini +++ b/tests/wpt/metadata/url/url-constructor.html.ini @@ -12,9 +12,6 @@ [Parsing: <data:test# »> against <about:blank>] expected: FAIL - [Parsing: <http://192.0x00A80001> against <about:blank>] - expected: FAIL - [Parsing: <http://GOOgoo.com> against <http://other.com/>] expected: FAIL @@ -27,12 +24,6 @@ [Parsing: <http://你好你好> against <http://other.com/>] expected: FAIL - [Parsing: <http://%30%78%63%30%2e%30%32%35%30.01> against <http://other.com/>] - expected: FAIL - - [Parsing: <http://192.168.0.257> against <http://other.com/>] - expected: FAIL - [Parsing: <http://0Xc0.0250.01> against <http://other.com/>] expected: FAIL @@ -173,7 +164,3 @@ [Parsing: <sc://ñ.test/> against <about:blank>] expected: FAIL - - [Parsing: <http://%30%78%63%30%2e%30%32%35%30.01%2e> against <http://other.com/>] - expected: FAIL - |