aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--components/devtools/Cargo.toml2
-rw-r--r--components/devtools_traits/Cargo.toml2
-rw-r--r--components/msg/Cargo.toml2
-rw-r--r--components/net/Cargo.toml2
-rw-r--r--components/net/fetch/request.rs2
-rw-r--r--components/net/http_loader.rs24
-rw-r--r--components/net/resource_task.rs2
-rw-r--r--components/net_traits/Cargo.toml2
-rw-r--r--components/script/Cargo.toml2
-rw-r--r--components/script/cors.rs6
-rw-r--r--components/script/dom/bindings/refcounted.rs12
-rw-r--r--components/script/dom/bindings/trace.rs13
-rw-r--r--components/script/dom/bindings/utils.rs1
-rw-r--r--components/script/dom/xmlhttprequest.rs3
-rw-r--r--components/servo/Cargo.lock112
-rw-r--r--components/style/Cargo.toml2
-rw-r--r--ports/cef/Cargo.lock108
-rw-r--r--ports/gonk/Cargo.lock106
-rw-r--r--rust-snapshot-hash2
-rw-r--r--tests/unit/net/Cargo.toml2
-rw-r--r--tests/unit/net/resource_task.rs5
21 files changed, 260 insertions, 152 deletions
diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml
index 27686ca05ae..63cba3ccfe3 100644
--- a/components/devtools/Cargo.toml
+++ b/components/devtools/Cargo.toml
@@ -21,4 +21,4 @@ log = "*"
time = "*"
rustc-serialize = "0.3"
url = "*"
-hyper = "0.5"
+hyper = "0.6"
diff --git a/components/devtools_traits/Cargo.toml b/components/devtools_traits/Cargo.toml
index b937361ab8d..9cdd5d1311a 100644
--- a/components/devtools_traits/Cargo.toml
+++ b/components/devtools_traits/Cargo.toml
@@ -17,5 +17,5 @@ path = "../util"
time = "*"
rustc-serialize = "0.3"
url = "*"
-hyper = "0.5"
+hyper = "0.6"
bitflags = "*"
diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml
index a6d895986cf..fefc32ef5b0 100644
--- a/components/msg/Cargo.toml
+++ b/components/msg/Cargo.toml
@@ -28,7 +28,7 @@ git = "https://github.com/pcwalton/ipc-channel"
[dependencies]
url = "0.2.35"
bitflags = "*"
-hyper = "0.5"
+hyper = "0.6"
rustc-serialize = "0.3.4"
euclid = "0.1"
serde = "*"
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index b99d107d038..17d3ee06d61 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -28,7 +28,7 @@ rustc-serialize = "0.3"
cookie="*"
regex = "0.1.14"
regex_macros = "0.1.8"
-hyper = "0.5"
+hyper = "0.6"
flate2 = "0.2.0"
uuid = "0.1.16"
euclid = "0.1"
diff --git a/components/net/fetch/request.rs b/components/net/fetch/request.rs
index 4add42400fc..7f689a28df0 100644
--- a/components/net/fetch/request.rs
+++ b/components/net/fetch/request.rs
@@ -7,7 +7,7 @@ use hyper::method::Method;
use hyper::mime::{Mime, TopLevel, SubLevel, Attr, Value};
use hyper::header::{Header, Headers, ContentType, IfModifiedSince, IfNoneMatch};
use hyper::header::{Accept, IfUnmodifiedSince, IfMatch, IfRange, Location};
-use hyper::header::{HeaderView, AcceptLanguage, ContentLanguage, Language};
+use hyper::header::{HeaderView, AcceptLanguage, ContentLanguage};
use hyper::header::{QualityItem, qitem, q};
use hyper::status::StatusCode;
use fetch::cors_cache::{CORSCache, CacheRequestDetails};
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index 65f9f335844..9b422ea07d3 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -17,10 +17,10 @@ use hyper::header::{AcceptEncoding, Accept, ContentLength, ContentType, Host, Lo
use hyper::Error as HttpError;
use hyper::method::Method;
use hyper::mime::{Mime, TopLevel, SubLevel};
-use hyper::net::HttpConnector;
+use hyper::net::{HttpConnector, HttpsConnector, Openssl};
use hyper::status::{StatusCode, StatusClass};
use std::error::Error;
-use openssl::ssl::{SslContext, SSL_VERIFY_PEER};
+use openssl::ssl::{SslContext, SslMethod, SSL_VERIFY_PEER};
use std::io::{self, Read, Write};
use std::sync::Arc;
use std::sync::mpsc::{Sender, channel};
@@ -117,24 +117,20 @@ fn load(mut load_data: LoadData, start_chan: LoadConsumer, classifier: Arc<MIMEC
info!("requesting {}", url.serialize());
- fn verifier(ssl: &mut SslContext) {
- ssl.set_verify(SSL_VERIFY_PEER, None);
- let mut certs = resources_dir_path();
- certs.push("certs");
- ssl.set_CA_file(&certs).unwrap();
- };
-
let ssl_err_string = "Some(OpenSslErrors([UnknownError { library: \"SSL routines\", \
function: \"SSL3_GET_SERVER_CERTIFICATE\", \
reason: \"certificate verify failed\" }]))";
- let mut connector = if opts::get().nossl {
- HttpConnector(None)
+ let req = if opts::get().nossl {
+ Request::with_connector(load_data.method.clone(), url.clone(), &HttpConnector)
} else {
- HttpConnector(Some(box verifier as Box<Fn(&mut SslContext) + Send>))
+ let mut context = SslContext::new(SslMethod::Sslv23).unwrap();
+ context.set_verify(SSL_VERIFY_PEER, None);
+ context.set_CA_file(&resources_dir_path().join("certs")).unwrap();
+ Request::with_connector(load_data.method.clone(), url.clone(),
+ &HttpsConnector::new(Openssl { context: Arc::new(context) }))
};
-
- let mut req = match Request::with_connector(load_data.method.clone(), url.clone(), &mut connector) {
+ let mut req = match req {
Ok(req) => req,
Err(HttpError::Io(ref io_error)) if (
io_error.kind() == io::ErrorKind::Other &&
diff --git a/components/net/resource_task.rs b/components/net/resource_task.rs
index 10eb26e8bde..7c97b5449b1 100644
--- a/components/net/resource_task.rs
+++ b/components/net/resource_task.rs
@@ -233,7 +233,7 @@ impl ResourceManager {
}
ControlMsg::SetCookiesForUrl(request, cookie_list, source) => {
let header = Header::parse_header(&[cookie_list.into_bytes()]);
- if let Some(SetCookie(cookies)) = header {
+ if let Ok(SetCookie(cookies)) = header {
for bare_cookie in cookies.into_iter() {
if let Some(cookie) = cookie::Cookie::new_wrapped(bare_cookie, &request, source) {
self.cookie_storage.push(cookie, source);
diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml
index 3bfe8910cb2..ca6a1515658 100644
--- a/components/net_traits/Cargo.toml
+++ b/components/net_traits/Cargo.toml
@@ -22,6 +22,6 @@ git = "https://github.com/servo/rust-stb-image"
[dependencies]
log = "*"
url = "0.2.35"
-hyper = "0.5"
+hyper = "0.6"
euclid = "0.1"
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index 6aefc2903d7..88b5dfd975f 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -66,7 +66,7 @@ time = "0.1.12"
bitflags = "*"
rustc-serialize = "*"
libc = "*"
-hyper = "0.5"
+hyper = "0.6"
cssparser = "0.3.1"
unicase = "0.1"
num = "0.1.24"
diff --git a/components/script/cors.rs b/components/script/cors.rs
index 6587d07bc97..c5a99fac63d 100644
--- a/components/script/cors.rs
+++ b/components/script/cors.rs
@@ -460,11 +460,7 @@ fn is_simple_method(m: &Method) -> bool {
pub fn allow_cross_origin_request(req: &CORSRequest, headers: &Headers) -> bool {
match headers.get::<AccessControlAllowOrigin>() {
Some(&AccessControlAllowOrigin::Any) => true, // Not always true, depends on credentials mode
- // FIXME: https://github.com/servo/servo/issues/6020
- Some(&AccessControlAllowOrigin::Value(ref url)) =>
- url.scheme == req.origin.scheme &&
- url.host() == req.origin.host() &&
- url.port() == req.origin.port(),
+ Some(&AccessControlAllowOrigin::Value(ref url)) => req.origin.serialize() == *url,
Some(&AccessControlAllowOrigin::Null) |
None => false
}
diff --git a/components/script/dom/bindings/refcounted.rs b/components/script/dom/bindings/refcounted.rs
index f7e2ba25e10..4e8baee7c0b 100644
--- a/components/script/dom/bindings/refcounted.rs
+++ b/components/script/dom/bindings/refcounted.rs
@@ -34,11 +34,19 @@ use std::cell::RefCell;
use std::collections::hash_map::HashMap;
use std::collections::hash_map::Entry::{Vacant, Occupied};
use std::marker::PhantomData;
-use std::rc::Rc;
use std::sync::{Arc, Mutex};
use core::nonzero::NonZero;
-thread_local!(pub static LIVE_REFERENCES: Rc<RefCell<Option<LiveDOMReferences>>> = Rc::new(RefCell::new(None)));
+
+#[allow(missing_docs)] // FIXME
+mod dummy { // Attributes don’t apply through the macro.
+ use std::rc::Rc;
+ use std::cell::RefCell;
+ use super::LiveDOMReferences;
+ thread_local!(pub static LIVE_REFERENCES: Rc<RefCell<Option<LiveDOMReferences>>> =
+ Rc::new(RefCell::new(None)));
+}
+pub use self::dummy::LIVE_REFERENCES;
/// A pointer to a Rust DOM object that needs to be destroyed.
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs
index 43e9814242e..b03255cd986 100644
--- a/components/script/dom/bindings/trace.rs
+++ b/components/script/dom/bindings/trace.rs
@@ -359,9 +359,16 @@ pub struct RootedTraceableSet {
set: Vec<TraceableInfo>
}
-/// TLV Holds a set of JSTraceables that need to be rooted
-thread_local!(pub static ROOTED_TRACEABLES: Rc<RefCell<RootedTraceableSet>> =
- Rc::new(RefCell::new(RootedTraceableSet::new())));
+#[allow(missing_docs)] // FIXME
+mod dummy { // Attributes don’t apply through the macro.
+ use std::rc::Rc;
+ use std::cell::RefCell;
+ use super::RootedTraceableSet;
+ /// TLV Holds a set of JSTraceables that need to be rooted
+ thread_local!(pub static ROOTED_TRACEABLES: Rc<RefCell<RootedTraceableSet>> =
+ Rc::new(RefCell::new(RootedTraceableSet::new())));
+}
+pub use self::dummy::ROOTED_TRACEABLES;
impl RootedTraceableSet {
fn new() -> RootedTraceableSet {
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index ed20587a206..1f243af768f 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -820,6 +820,7 @@ unsafe extern "C" fn instance_class_has_proto_at_depth(clasp: *const js::jsapi::
(domclass.dom_class.interface_chain[depth as usize] as u32 == proto_id) as u8
}
+#[allow(missing_docs)] // FIXME
pub const DOM_CALLBACKS: DOMCallbacks = DOMCallbacks {
instanceClassMatchesProto: Some(instance_class_has_proto_at_depth),
};
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index d849fbdd3ba..823c3eda264 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -1038,6 +1038,7 @@ impl<'a> PrivateXMLHttpRequestHelpers for &'a XMLHttpRequest {
use std::fmt;
use hyper::header::{Header, HeaderFormat};
use hyper::header::SetCookie;
+ use hyper::error::Result;
// a dummy header so we can use headers.remove::<SetCookie2>()
#[derive(Clone, Debug)]
@@ -1047,7 +1048,7 @@ impl<'a> PrivateXMLHttpRequestHelpers for &'a XMLHttpRequest {
"set-cookie2"
}
- fn parse_header(_: &[Vec<u8>]) -> Option<SetCookie2> {
+ fn parse_header(_: &[Vec<u8>]) -> Result<SetCookie2> {
unimplemented!()
}
}
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index f69593bc603..486e79961ff 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -3,7 +3,7 @@ name = "servo"
version = "0.0.1"
dependencies = [
"android_glue 0.0.2",
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"compositing 0.0.1",
"devtools 0.0.1",
"devtools_traits 0.0.1",
@@ -55,7 +55,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "azure"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#d8c86d7864bdf782734981f17ca7561c97bdaf98"
+source = "git+https://github.com/servo/rust-azure#0df816623d464869adfb53a16aee55e499fb3e07"
dependencies = [
"core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -65,6 +65,8 @@ dependencies = [
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"skia 0.0.20130412 (git+https://github.com/servo/skia)",
"x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -76,7 +78,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "bitflags"
-version = "0.2.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -90,7 +92,7 @@ version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"canvas_traits 0.0.1",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"gfx_traits 0.0.1",
"gleam 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -106,7 +108,7 @@ name = "canvas_traits"
version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"gfx_traits 0.0.1",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
@@ -220,7 +222,7 @@ dependencies = [
[[package]]
name = "cssparser"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -237,7 +239,7 @@ name = "devtools"
version = "0.0.1"
dependencies = [
"devtools_traits 0.0.1",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -250,8 +252,8 @@ dependencies = [
name = "devtools_traits"
version = "0.0.1"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -422,7 +424,7 @@ name = "gfx"
version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1",
"core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -522,7 +524,7 @@ dependencies = [
name = "glutin_app"
version = "0.0.1"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"compositing 0.0.1",
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
@@ -560,6 +562,14 @@ dependencies = [
]
[[package]]
+name = "hpack"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "html5ever"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -591,16 +601,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "hyper"
-version = "0.5.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cookie 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
"httparse 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "language-tags 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solicit 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -657,9 +669,14 @@ version = "0.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
+name = "language-tags"
+version = "0.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
name = "layers"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-layers#fff80972a75b5c4bce731de2ee2452bb8ef96430"
+source = "git+https://github.com/servo/rust-layers#b1bb589f414a11ef577ea18cfc2814bdb40ea4dc"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -681,11 +698,11 @@ name = "layout"
version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
"clock_ticks 0.0.6 (git+https://github.com/tomaka/clock_ticks)",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -782,7 +799,7 @@ dependencies = [
[[package]]
name = "mime"
-version = "0.0.11"
+version = "0.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -807,10 +824,10 @@ name = "msg"
version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
"ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
@@ -831,7 +848,7 @@ dependencies = [
"devtools_traits 0.0.1",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"net_traits 0.0.1",
"openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -850,7 +867,7 @@ name = "net_tests"
version = "0.0.1"
dependencies = [
"cookie 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"net 0.0.1",
"net_traits 0.0.1",
"url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -862,7 +879,7 @@ name = "net_traits"
version = "0.0.1"
dependencies = [
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
@@ -1099,16 +1116,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "script"
version = "0.0.1"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"devtools_traits 0.0.1",
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"html5ever 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1133,7 +1150,7 @@ dependencies = [
"url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "websocket 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "websocket 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1163,7 +1180,7 @@ version = "0.1.0"
source = "git+https://github.com/servo/rust-selectors#a16e32540845548d46857f2896248c382ef34393"
dependencies = [
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quicksort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1210,10 +1227,18 @@ dependencies = [
[[package]]
name = "skia"
version = "0.0.20130412"
-source = "git+https://github.com/servo/skia#92df68b91084bbe1e025efa64a1647471eb17afc"
+source = "git+https://github.com/servo/skia#62a452b39294d94e60f279eacbb71a0b329661a5"
dependencies = [
+ "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
+ "euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"expat-sys 2.1.0 (git+https://github.com/servo/libexpat)",
"freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
+ "gleam 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glx 0.0.1 (git+https://github.com/servo/rust-glx)",
+ "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
+ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1222,6 +1247,15 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
+name = "solicit"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "hpack 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "stb_image"
version = "0.1.0"
source = "git+https://github.com/servo/rust-stb-image#e3f7246caa694e863975ead98f4940d046108fd7"
@@ -1261,8 +1295,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "style"
version = "0.0.1"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1284,7 +1318,7 @@ dependencies = [
name = "style_tests"
version = "0.0.1"
dependencies = [
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"string_cache 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1372,8 +1406,8 @@ name = "util"
version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1410,9 +1444,9 @@ dependencies = [
[[package]]
name = "webdriver"
version = "0.2.0"
-source = "git+https://github.com/jgraham/webdriver-rust.git#b9cf2b1f65d4f01f593de29a581518feeb6b5a64"
+source = "git+https://github.com/jgraham/webdriver-rust.git#caf906e67d818f2db5d4f31b08abb0fee561ec43"
dependencies = [
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1435,12 +1469,12 @@ dependencies = [
[[package]]
name = "websocket"
-version = "0.12.1"
+version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1475,6 +1509,6 @@ name = "xml-rs"
version = "0.1.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
index 1b8474f18bd..10f0e40f658 100644
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@@ -27,7 +27,7 @@ rustc-serialize = "0.3"
matches = "0.1"
url = "0.2.35"
bitflags = "*"
-cssparser = "0.3.1"
+cssparser = "0.3.2"
num = "0.1.24"
lazy_static = "0.1.10"
smallvec = "0.1"
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index c488fa1c86a..2c6062620be 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -54,7 +54,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "azure"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#d8c86d7864bdf782734981f17ca7561c97bdaf98"
+source = "git+https://github.com/servo/rust-azure#0df816623d464869adfb53a16aee55e499fb3e07"
dependencies = [
"core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -64,6 +64,8 @@ dependencies = [
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"skia 0.0.20130412 (git+https://github.com/servo/skia)",
"x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -75,7 +77,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "bitflags"
-version = "0.2.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -89,7 +91,7 @@ version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"canvas_traits 0.0.1",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"gfx_traits 0.0.1",
"gleam 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -105,7 +107,7 @@ name = "canvas_traits"
version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"gfx_traits 0.0.1",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
@@ -219,7 +221,7 @@ dependencies = [
[[package]]
name = "cssparser"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -236,7 +238,7 @@ name = "devtools"
version = "0.0.1"
dependencies = [
"devtools_traits 0.0.1",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -249,8 +251,8 @@ dependencies = [
name = "devtools_traits"
version = "0.0.1"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -421,7 +423,7 @@ name = "gfx"
version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1",
"core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -514,7 +516,7 @@ dependencies = [
name = "glutin_app"
version = "0.0.1"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"compositing 0.0.1",
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
@@ -552,6 +554,14 @@ dependencies = [
]
[[package]]
+name = "hpack"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "html5ever"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -583,16 +593,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "hyper"
-version = "0.5.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cookie 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
"httparse 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "language-tags 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solicit 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -649,9 +661,14 @@ version = "0.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
+name = "language-tags"
+version = "0.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
name = "layers"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-layers#fff80972a75b5c4bce731de2ee2452bb8ef96430"
+source = "git+https://github.com/servo/rust-layers#b1bb589f414a11ef577ea18cfc2814bdb40ea4dc"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -673,11 +690,11 @@ name = "layout"
version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
"clock_ticks 0.0.6 (git+https://github.com/tomaka/clock_ticks)",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -774,7 +791,7 @@ dependencies = [
[[package]]
name = "mime"
-version = "0.0.11"
+version = "0.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -799,10 +816,10 @@ name = "msg"
version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
"ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
@@ -823,7 +840,7 @@ dependencies = [
"devtools_traits 0.0.1",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"net_traits 0.0.1",
"openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -842,7 +859,7 @@ name = "net_traits"
version = "0.0.1"
dependencies = [
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
@@ -1079,16 +1096,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "script"
version = "0.0.1"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"devtools_traits 0.0.1",
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"html5ever 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1113,7 +1130,7 @@ dependencies = [
"url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "websocket 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "websocket 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1135,7 +1152,7 @@ version = "0.1.0"
source = "git+https://github.com/servo/rust-selectors#a16e32540845548d46857f2896248c382ef34393"
dependencies = [
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quicksort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1174,7 +1191,7 @@ dependencies = [
name = "servo"
version = "0.0.1"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"compositing 0.0.1",
"devtools 0.0.1",
"devtools_traits 0.0.1",
@@ -1208,10 +1225,18 @@ dependencies = [
[[package]]
name = "skia"
version = "0.0.20130412"
-source = "git+https://github.com/servo/skia#92df68b91084bbe1e025efa64a1647471eb17afc"
+source = "git+https://github.com/servo/skia#62a452b39294d94e60f279eacbb71a0b329661a5"
dependencies = [
+ "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
+ "euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"expat-sys 2.1.0 (git+https://github.com/servo/libexpat)",
"freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
+ "gleam 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glx 0.0.1 (git+https://github.com/servo/rust-glx)",
+ "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
+ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1220,6 +1245,15 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
+name = "solicit"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "hpack 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "stb_image"
version = "0.1.0"
source = "git+https://github.com/servo/rust-stb-image#e3f7246caa694e863975ead98f4940d046108fd7"
@@ -1259,8 +1293,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "style"
version = "0.0.1"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1356,8 +1390,8 @@ name = "util"
version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1384,9 +1418,9 @@ dependencies = [
[[package]]
name = "webdriver"
version = "0.2.0"
-source = "git+https://github.com/jgraham/webdriver-rust.git#b9cf2b1f65d4f01f593de29a581518feeb6b5a64"
+source = "git+https://github.com/jgraham/webdriver-rust.git#caf906e67d818f2db5d4f31b08abb0fee561ec43"
dependencies = [
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1409,12 +1443,12 @@ dependencies = [
[[package]]
name = "websocket"
-version = "0.12.1"
+version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1449,6 +1483,6 @@ name = "xml-rs"
version = "0.1.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 6d7216535fa..8c7b256a8cf 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -41,7 +41,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "azure"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#d8c86d7864bdf782734981f17ca7561c97bdaf98"
+source = "git+https://github.com/servo/rust-azure#0df816623d464869adfb53a16aee55e499fb3e07"
dependencies = [
"core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -51,6 +51,8 @@ dependencies = [
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"skia 0.0.20130412 (git+https://github.com/servo/skia)",
"x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -62,7 +64,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "bitflags"
-version = "0.2.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -76,7 +78,7 @@ version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"canvas_traits 0.0.1",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"gfx_traits 0.0.1",
"gleam 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -92,7 +94,7 @@ name = "canvas_traits"
version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"gfx_traits 0.0.1",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
@@ -196,7 +198,7 @@ dependencies = [
[[package]]
name = "cssparser"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -213,7 +215,7 @@ name = "devtools"
version = "0.0.1"
dependencies = [
"devtools_traits 0.0.1",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -226,8 +228,8 @@ dependencies = [
name = "devtools_traits"
version = "0.0.1"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -400,7 +402,7 @@ name = "gfx"
version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1",
"core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -486,6 +488,14 @@ dependencies = [
]
[[package]]
+name = "hpack"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "html5ever"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -517,16 +527,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "hyper"
-version = "0.5.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cookie 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
"httparse 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "language-tags 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solicit 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -583,9 +595,14 @@ version = "0.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
+name = "language-tags"
+version = "0.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
name = "layers"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-layers#fff80972a75b5c4bce731de2ee2452bb8ef96430"
+source = "git+https://github.com/servo/rust-layers#b1bb589f414a11ef577ea18cfc2814bdb40ea4dc"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -607,11 +624,11 @@ name = "layout"
version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
"clock_ticks 0.0.6 (git+https://github.com/tomaka/clock_ticks)",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -700,7 +717,7 @@ dependencies = [
[[package]]
name = "mime"
-version = "0.0.11"
+version = "0.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -725,10 +742,10 @@ name = "msg"
version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
"ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
@@ -749,7 +766,7 @@ dependencies = [
"devtools_traits 0.0.1",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"net_traits 0.0.1",
"openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -768,7 +785,7 @@ name = "net_traits"
version = "0.0.1"
dependencies = [
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
@@ -987,16 +1004,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "script"
version = "0.0.1"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"devtools_traits 0.0.1",
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"html5ever 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1021,7 +1038,7 @@ dependencies = [
"url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "websocket 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "websocket 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1043,7 +1060,7 @@ version = "0.1.0"
source = "git+https://github.com/servo/rust-selectors#a16e32540845548d46857f2896248c382ef34393"
dependencies = [
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quicksort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1082,7 +1099,7 @@ dependencies = [
name = "servo"
version = "0.0.1"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"compositing 0.0.1",
"devtools 0.0.1",
"devtools_traits 0.0.1",
@@ -1106,10 +1123,18 @@ dependencies = [
[[package]]
name = "skia"
version = "0.0.20130412"
-source = "git+https://github.com/servo/skia#92df68b91084bbe1e025efa64a1647471eb17afc"
+source = "git+https://github.com/servo/skia#62a452b39294d94e60f279eacbb71a0b329661a5"
dependencies = [
+ "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
+ "euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"expat-sys 2.1.0 (git+https://github.com/servo/libexpat)",
"freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
+ "gleam 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glx 0.0.1 (git+https://github.com/servo/rust-glx)",
+ "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
+ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1118,6 +1143,15 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
+name = "solicit"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "hpack 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "stb_image"
version = "0.1.0"
source = "git+https://github.com/servo/rust-stb-image#e3f7246caa694e863975ead98f4940d046108fd7"
@@ -1157,8 +1191,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "style"
version = "0.0.1"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1245,8 +1279,8 @@ name = "util"
version = "0.0.1"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1273,9 +1307,9 @@ dependencies = [
[[package]]
name = "webdriver"
version = "0.2.0"
-source = "git+https://github.com/jgraham/webdriver-rust.git#b9cf2b1f65d4f01f593de29a581518feeb6b5a64"
+source = "git+https://github.com/jgraham/webdriver-rust.git#caf906e67d818f2db5d4f31b08abb0fee561ec43"
dependencies = [
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1298,12 +1332,12 @@ dependencies = [
[[package]]
name = "websocket"
-version = "0.12.1"
+version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1338,6 +1372,6 @@ name = "xml-rs"
version = "0.1.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
diff --git a/rust-snapshot-hash b/rust-snapshot-hash
index 38201484b64..c4507561da4 100644
--- a/rust-snapshot-hash
+++ b/rust-snapshot-hash
@@ -1 +1 @@
-f3b97a74aade8cb13a10c3669a1c18e19ff45890/rustc-1.3.0-dev
+fddfd089b75379f1d25f81541572d69a93f95c4f/rustc-1.3.0-dev
diff --git a/tests/unit/net/Cargo.toml b/tests/unit/net/Cargo.toml
index c03bbf28bec..7ec4008bbfd 100644
--- a/tests/unit/net/Cargo.toml
+++ b/tests/unit/net/Cargo.toml
@@ -19,5 +19,5 @@ path = "../../../components/util"
[dependencies]
cookie = "*"
-hyper = "0.5"
+hyper = "0.6"
url = "*"
diff --git a/tests/unit/net/resource_task.rs b/tests/unit/net/resource_task.rs
index 9a902c43282..5abfc40ba45 100644
--- a/tests/unit/net/resource_task.rs
+++ b/tests/unit/net/resource_task.rs
@@ -6,7 +6,6 @@ use net::resource_task::{new_resource_task, parse_hostsfile, replace_hosts};
use net_traits::{ControlMsg, LoadData, LoadConsumer};
use net_traits::ProgressMsg;
use std::borrow::ToOwned;
-use std::boxed;
use std::collections::HashMap;
use std::sync::mpsc::channel;
use url::Url;
@@ -162,9 +161,7 @@ fn test_replace_hosts() {
host_table_box.insert("foo.bar.com".to_owned(), "127.0.0.1".to_owned());
host_table_box.insert("servo.test.server".to_owned(), "127.0.0.2".to_owned());
- let host_table: *mut HashMap<String, String> = unsafe {
- boxed::into_raw(host_table_box)
- };
+ let host_table: *mut HashMap<String, String> = Box::into_raw(host_table_box);
//Start the TCP server
let listener = TcpListener::bind("127.0.0.1:0").unwrap();
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 23:00:16 +0000