diff options
70 files changed, 919 insertions, 778 deletions
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index 1862d51462c..7475dc7202c 100644 --- a/components/canvas/Cargo.toml +++ b/components/canvas/Cargo.toml @@ -12,13 +12,13 @@ path = "lib.rs" [dependencies] azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]} canvas_traits = {path = "../canvas_traits"} -euclid = "0.8.2" +euclid = "0.9" gfx_traits = {path = "../gfx_traits"} gleam = "0.2.8" -ipc-channel = "0.4.0" +ipc-channel = "0.5" log = "0.3.5" num-traits = "0.1.32" -offscreen_gl_context = "0.2.0" +offscreen_gl_context = "0.3" plugins = {path = "../plugins"} util = {path = "../util"} diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml index 5f24a59ce6a..63bd06e8baa 100644 --- a/components/canvas_traits/Cargo.toml +++ b/components/canvas_traits/Cargo.toml @@ -11,15 +11,15 @@ path = "lib.rs" [dependencies] azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]} -cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]} -euclid = "0.8.2" +cssparser = {version = "0.5.7", features = ["heap_size", "serde-serialization"]} +euclid = "0.9" gfx_traits = {path = "../gfx_traits"} heapsize = "0.3.0" heapsize_plugin = "0.1.2" -ipc-channel = "0.4.0" +ipc-channel = "0.5" plugins = {path = "../plugins"} -serde = {version = "0.7.15", features = ["nightly"]} -serde_macros = "0.7.15" +serde = {version = "0.8", features = ["unstable"]} +serde_macros = "0.8" [dependencies.webrender_traits] git = "https://github.com/servo/webrender_traits" diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index f928ef72793..cb8a8b9fe01 100644 --- a/components/compositing/Cargo.toml +++ b/components/compositing/Cargo.toml @@ -10,13 +10,13 @@ name = "compositing" path = "lib.rs" [dependencies] -app_units = "0.2.5" +app_units = "0.3" azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]} -euclid = "0.8.2" +euclid = "0.9" gfx_traits = {path = "../gfx_traits"} gleam = "0.2.8" image = "0.10" -ipc-channel = "0.4.0" +ipc-channel = "0.5" layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]} log = "0.3.5" msg = {path = "../msg"} @@ -24,11 +24,11 @@ net_traits = {path = "../net_traits"} plugins = {path = "../plugins"} profile_traits = {path = "../profile_traits"} script_traits = {path = "../script_traits"} -serde = "0.7.15" -serde_macros = "0.7.15" +serde = "0.8" +serde_macros = "0.8" style_traits = {path = "../style_traits"} time = "0.1.17" -url = {version = "1.0.0", features = ["heap_size"]} +url = {version = "1.2", features = ["heap_size"]} util = {path = "../util"} [dependencies.webrender] diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml index 4a60533d200..84c0b46cd2f 100644 --- a/components/constellation/Cargo.toml +++ b/components/constellation/Cargo.toml @@ -15,24 +15,24 @@ canvas = {path = "../canvas"} canvas_traits = {path = "../canvas_traits"} compositing = {path = "../compositing"} devtools_traits = {path = "../devtools_traits"} -euclid = "0.8.2" +euclid = "0.9" gfx = {path = "../gfx"} gfx_traits = {path = "../gfx_traits"} -ipc-channel = "0.4.0" +ipc-channel = "0.5" layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]} layout_traits = {path = "../layout_traits"} log = "0.3.5" msg = {path = "../msg"} net_traits = {path = "../net_traits"} -offscreen_gl_context = "0.2.0" +offscreen_gl_context = "0.3" plugins = {path = "../plugins"} profile_traits = {path = "../profile_traits"} rand = "0.3" script_traits = {path = "../script_traits"} -serde = "0.7.15" -serde_macros = "0.7.15" +serde = "0.8" +serde_macros = "0.8" style_traits = {path = "../style_traits"} -url = {version = "1.0.0", features = ["heap_size"]} +url = {version = "1.2", features = ["heap_size"]} util = {path = "../util"} [dependencies.webrender_traits] diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml index 9bcf7f54a00..230c16af6c2 100644 --- a/components/devtools/Cargo.toml +++ b/components/devtools/Cargo.toml @@ -11,13 +11,14 @@ path = "lib.rs" [dependencies] devtools_traits = {path = "../devtools_traits"} -hyper = { version = "0.9.9", features = [ "serde-serialization" ] } -ipc-channel = "0.4.0" +hyper = "0.9.9" +hyper_serde = "0.1.4" +ipc-channel = "0.5" log = "0.3.5" msg = {path = "../msg"} plugins = {path = "../plugins"} -serde = "0.7.15" -serde_json = "0.7" -serde_macros = "0.7.15" +serde = "0.8" +serde_json = "0.8" +serde_macros = "0.8" time = "0.1" util = {path = "../util"} diff --git a/components/devtools/actor.rs b/components/devtools/actor.rs index c439ad0e028..6d2e4ab1869 100644 --- a/components/devtools/actor.rs +++ b/components/devtools/actor.rs @@ -153,12 +153,12 @@ impl ActorRegistry { msg: &BTreeMap<String, Value>, stream: &mut TcpStream) -> Result<(), ()> { - let to = msg.get("to").unwrap().as_string().unwrap(); + let to = msg.get("to").unwrap().as_str().unwrap(); match self.actors.get(to) { None => debug!("message received for unknown actor \"{}\"", to), Some(actor) => { - let msg_type = msg.get("type").unwrap().as_string().unwrap(); + let msg_type = msg.get("type").unwrap().as_str().unwrap(); if try!(actor.handle_message(self, msg_type, msg, stream)) != ActorMessageStatus::Processed { debug!("unexpected message type \"{}\" found for actor \"{}\"", diff --git a/components/devtools/actors/console.rs b/components/devtools/actors/console.rs index d6cfbe10f51..67eea6f6714 100644 --- a/components/devtools/actors/console.rs +++ b/components/devtools/actors/console.rs @@ -103,7 +103,7 @@ impl Actor for ConsoleActor { Ok(match msg_type { "getCachedMessages" => { let str_types = msg.get("messageTypes").unwrap().as_array().unwrap().into_iter().map(|json_type| { - json_type.as_string().unwrap() + json_type.as_str().unwrap() }); let mut message_types = CachedConsoleMessageTypes::empty(); for str_type in str_types { @@ -154,7 +154,7 @@ impl Actor for ConsoleActor { .as_array() .unwrap_or(&vec!()) .iter() - .map(|listener| listener.as_string().unwrap().to_owned()) + .map(|listener| listener.as_str().unwrap().to_owned()) .collect(), }; stream.write_json_packet(&msg); @@ -174,7 +174,7 @@ impl Actor for ConsoleActor { } "evaluateJS" => { - let input = msg.get("text").unwrap().as_string().unwrap().to_owned(); + let input = msg.get("text").unwrap().as_str().unwrap().to_owned(); let (chan, port) = ipc::channel().unwrap(); self.script_chan.send(DevtoolScriptControlMsg::EvaluateJS( self.pipeline, input.clone(), chan)).unwrap(); diff --git a/components/devtools/actors/inspector.rs b/components/devtools/actors/inspector.rs index 0328c538e84..5e0d4455cc3 100644 --- a/components/devtools/actors/inspector.rs +++ b/components/devtools/actors/inspector.rs @@ -106,7 +106,7 @@ impl Actor for NodeActor { stream: &mut TcpStream) -> Result<ActorMessageStatus, ()> { Ok(match msg_type { "modifyAttributes" => { - let target = msg.get("to").unwrap().as_string().unwrap(); + let target = msg.get("to").unwrap().as_str().unwrap(); let mods = msg.get("modifications").unwrap().as_array().unwrap(); let modifications = mods.iter().map(|json_mod| { serde_json::from_str(&serde_json::to_string(json_mod).unwrap()).unwrap() @@ -310,7 +310,7 @@ impl Actor for WalkerActor { } "children" => { - let target = msg.get("node").unwrap().as_string().unwrap(); + let target = msg.get("node").unwrap().as_str().unwrap(); let (tx, rx) = ipc::channel().unwrap(); self.script_chan.send(GetChildren(self.pipeline, registry.actor_to_script(target.to_owned()), @@ -478,7 +478,7 @@ impl Actor for PageStyleActor { //TODO: query script for box layout properties of node (msg.node) "getLayout" => { - let target = msg.get("node").unwrap().as_string().unwrap(); + let target = msg.get("node").unwrap().as_str().unwrap(); let (tx, rx) = ipc::channel().unwrap(); self.script_chan.send(GetLayout(self.pipeline, registry.actor_to_script(target.to_owned()), @@ -493,7 +493,7 @@ impl Actor for PageStyleActor { } = try!(rx.recv().unwrap().ok_or(())); let auto_margins = msg.get("autoMargins") - .and_then(&Value::as_boolean).unwrap_or(false); + .and_then(&Value::as_bool).unwrap_or(false); // http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/styles.js let msg = GetLayoutReply { diff --git a/components/devtools/actors/tab.rs b/components/devtools/actors/tab.rs index fd93553e6b7..53b3766b124 100644 --- a/components/devtools/actors/tab.rs +++ b/components/devtools/actors/tab.rs @@ -94,7 +94,7 @@ impl Actor for TabActor { "reconfigure" => { if let Some(options) = msg.get("options").and_then(|o| o.as_object()) { if let Some(val) = options.get("performReload") { - if val.as_boolean().unwrap_or(false) { + if val.as_bool().unwrap_or(false) { let console_actor = registry.find::<ConsoleActor>(&self.console); let _ = console_actor.script_chan.send( DevtoolScriptControlMsg::Reload(console_actor.pipeline)); diff --git a/components/devtools/actors/timeline.rs b/components/devtools/actors/timeline.rs index 91231d08a52..5a2297407ca 100644 --- a/components/devtools/actors/timeline.rs +++ b/components/devtools/actors/timeline.rs @@ -191,14 +191,14 @@ impl Actor for TimelineActor { // init memory actor if let Some(with_memory) = msg.get("withMemory") { - if let Some(true) = with_memory.as_boolean() { + if let Some(true) = with_memory.as_bool() { *self.memory_actor.borrow_mut() = Some(MemoryActor::create(registry)); } } // init framerate actor if let Some(with_ticks) = msg.get("withTicks") { - if let Some(true) = with_ticks.as_boolean() { + if let Some(true) = with_ticks.as_bool() { let framerate_actor = Some(FramerateActor::create( registry, self.pipeline.clone(), diff --git a/components/devtools/protocol.rs b/components/devtools/protocol.rs index b385f396c1b..eb46ed38489 100644 --- a/components/devtools/protocol.rs +++ b/components/devtools/protocol.rs @@ -86,9 +86,6 @@ impl JsonPacketStream for TcpStream { serde_json::Error::Syntax(_, l, c) => { return Err(format!("syntax at {}:{}", l, c)) }, - serde_json::Error::FromUtf8(e) => { - return Err(e.description().to_owned()) - }, }, }; }, diff --git a/components/devtools_traits/Cargo.toml b/components/devtools_traits/Cargo.toml index 22ba037a7b0..7e5074d7cf6 100644 --- a/components/devtools_traits/Cargo.toml +++ b/components/devtools_traits/Cargo.toml @@ -13,10 +13,11 @@ path = "lib.rs" bitflags = "0.7" heapsize = "0.3.0" heapsize_plugin = "0.1.2" -hyper = {version = "0.9.9", features = ["serde-serialization"]} -ipc-channel = "0.4.0" +hyper = "0.9.9" +hyper_serde = "0.1.4" +ipc-channel = "0.5" msg = {path = "../msg"} -serde = "0.7.15" -serde_macros = "0.7.15" +serde = "0.8" +serde_macros = "0.8" time = "0.1" -url = {version = "1.0.0", features = ["heap_size"]} +url = {version = "1.2", features = ["heap_size"]} diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index cbfabf787ae..9e1eaa1725e 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -11,16 +11,16 @@ name = "gfx" path = "lib.rs" [dependencies] -app_units = "0.2.5" +app_units = "0.3" azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]} bitflags = "0.7" -euclid = "0.8.2" +euclid = "0.9" fnv = "1.0" gfx_traits = {path = "../gfx_traits"} harfbuzz-sys = "0.1" heapsize = "0.3.0" heapsize_plugin = "0.1.2" -ipc-channel = "0.4.0" +ipc-channel = "0.5" layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]} lazy_static = "0.2" libc = "0.2" @@ -34,15 +34,15 @@ profile_traits = {path = "../profile_traits"} rand = "0.3" range = {path = "../range"} rustc-serialize = "0.3" -serde = "0.7.15" -serde_macros = "0.7.15" +serde = "0.8" +serde_macros = "0.8" smallvec = "0.1" -string_cache = {version = "0.2.20", features = ["heap_size"]} +string_cache = {version = "0.2.23", features = ["heap_size"]} style = {path = "../style"} style_traits = {path = "../style_traits"} time = "0.1.12" unicode-script = {version = "0.1", features = ["harfbuzz"]} -url = {version = "1.0.0", features = ["heap_size"]} +url = {version = "1.2", features = ["heap_size"]} util = {path = "../util"} xi-unicode = "0.0.1" @@ -54,8 +54,8 @@ features = ["serde_macros"] [target.'cfg(target_os = "macos")'.dependencies] byteorder = "0.5" core-foundation = "0.2" -core-graphics = "0.3" -core-text = "1.1" +core-graphics = "0.4" +core-text = "2.0" [target.'cfg(any(target_os = "linux", target_os = "android", target_os = "windows"))'.dependencies] freetype = {git = "https://github.com/servo/rust-freetype"} diff --git a/components/gfx/display_list/mod.rs b/components/gfx/display_list/mod.rs index a9a8a194312..0e16da27133 100644 --- a/components/gfx/display_list/mod.rs +++ b/components/gfx/display_list/mod.rs @@ -31,7 +31,6 @@ use net_traits::image::base::{Image, PixelFormat}; use paint_context::PaintContext; use range::Range; use serde::de::{self, Deserialize, Deserializer, MapVisitor, Visitor}; -use serde::ser::impls::MapIteratorVisitor; use serde::ser::{Serialize, Serializer}; use std::cmp::{self, Ordering}; use std::collections::HashMap; @@ -161,7 +160,12 @@ impl<K, V> DerefMut for FnvHashMap<K, V> { impl<K, V> Serialize for FnvHashMap<K, V> where K: Eq + Hash + Serialize, V: Serialize { #[inline] fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error> where S: Serializer { - serializer.serialize_map(MapIteratorVisitor::new(self.iter(), Some(self.len()))) + let mut state = try!(serializer.serialize_map(Some(self.len()))); + for (key, value) in self.iter() { + try!(serializer.serialize_map_key(&mut state, key)); + try!(serializer.serialize_map_value(&mut state, value)); + } + serializer.serialize_map_end(state) } } diff --git a/components/gfx/font_cache_thread.rs b/components/gfx/font_cache_thread.rs index 4ba4af2b39f..9b761900a80 100644 --- a/components/gfx/font_cache_thread.rs +++ b/components/gfx/font_cache_thread.rs @@ -229,7 +229,7 @@ impl FontCache { Ok(ref metadata) => { metadata.content_type.as_ref().map_or(false, |content_type| { let mime = &content_type.0; - is_supported_font_type(&mime.0, &mime.1) + is_supported_font_type(&(mime.0).0, &mime.1) }) } Err(_) => false, diff --git a/components/gfx_traits/Cargo.toml b/components/gfx_traits/Cargo.toml index 96f0155e516..70998ece275 100644 --- a/components/gfx_traits/Cargo.toml +++ b/components/gfx_traits/Cargo.toml @@ -11,7 +11,7 @@ path = "lib.rs" [dependencies] azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]} -euclid = "0.8.2" +euclid = "0.9" heapsize = "0.3.0" heapsize_plugin = "0.1.2" layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]} @@ -20,5 +20,5 @@ plugins = {path = "../plugins"} profile_traits = {path = "../profile_traits"} range = {path = "../range"} rustc-serialize = "0.3" -serde = "0.7.15" -serde_macros = "0.7.15" +serde = "0.8" +serde_macros = "0.8" diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 6ad730473ad..1bddb701764 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -10,18 +10,18 @@ name = "layout" path = "lib.rs" [dependencies] -app_units = "0.2.5" +app_units = "0.3" azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]} bitflags = "0.7" canvas_traits = {path = "../canvas_traits"} -cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]} -euclid = "0.8.2" +cssparser = {version = "0.5.7", features = ["heap_size", "serde-serialization"]} +euclid = "0.9" fnv = "1.0" gfx = {path = "../gfx"} gfx_traits = {path = "../gfx_traits"} heapsize = "0.3.0" heapsize_plugin = "0.1.2" -ipc-channel = "0.4.0" +ipc-channel = "0.5" libc = "0.2" log = "0.3.5" msg = {path = "../msg"} @@ -34,14 +34,14 @@ rustc-serialize = "0.3" script_layout_interface = {path = "../script_layout_interface"} script_traits = {path = "../script_traits"} selectors = {version = "0.8", features = ["heap_size"]} -serde_macros = "0.7.15" +serde_macros = "0.8" smallvec = "0.1" -string_cache = {version = "0.2.20", features = ["heap_size"]} +string_cache = {version = "0.2.23", features = ["heap_size"]} style = {path = "../style"} style_traits = {path = "../style_traits"} unicode-bidi = "0.2" unicode-script = {version = "0.1", features = ["harfbuzz"]} -url = {version = "1.0.0", features = ["heap_size"]} +url = {version = "1.2", features = ["heap_size"]} util = {path = "../util"} [dependencies.webrender_traits] diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml index a1e4953c126..a010ab77b03 100644 --- a/components/layout_thread/Cargo.toml +++ b/components/layout_thread/Cargo.toml @@ -10,15 +10,15 @@ name = "layout_thread" path = "lib.rs" [dependencies] -app_units = "0.2.5" +app_units = "0.3" azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]} -euclid = "0.8.2" +euclid = "0.9" fnv = "1.0" gfx = {path = "../gfx"} gfx_traits = {path = "../gfx_traits"} heapsize = "0.3.0" heapsize_plugin = "0.1.2" -ipc-channel = "0.4.0" +ipc-channel = "0.5" layout = {path = "../layout"} layout_traits = {path = "../layout_traits"} log = "0.3.5" @@ -29,10 +29,10 @@ profile_traits = {path = "../profile_traits"} script = {path = "../script"} script_layout_interface = {path = "../script_layout_interface"} script_traits = {path = "../script_traits"} -serde_json = "0.7" -serde_macros = "0.7.15" +serde_json = "0.8" +serde_macros = "0.8" style = {path = "../style"} -url = {version = "1.0.0", features = ["heap_size"]} +url = {version = "1.2", features = ["heap_size"]} util = {path = "../util"} [dependencies.webrender_traits] diff --git a/components/layout_traits/Cargo.toml b/components/layout_traits/Cargo.toml index 653ae4102b7..a1161a347ee 100644 --- a/components/layout_traits/Cargo.toml +++ b/components/layout_traits/Cargo.toml @@ -16,8 +16,8 @@ msg = {path = "../msg"} net_traits = {path = "../net_traits"} profile_traits = {path = "../profile_traits"} util = {path = "../util"} -ipc-channel = "0.4.0" -url = {version = "1.0.0", features = ["heap_size"]} +ipc-channel = "0.5" +url = {version = "1.2", features = ["heap_size"]} [dependencies.webrender_traits] git = "https://github.com/servo/webrender_traits" diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index 06e60c24054..f8795576a17 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -11,15 +11,16 @@ path = "lib.rs" [dependencies] bitflags = "0.7" -cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]} +cssparser = {version = "0.5.7", features = ["heap_size", "serde-serialization"]} heapsize = "0.3.0" heapsize_plugin = "0.1.2" -hyper = {version = "0.9.9", features = ["serde-serialization"]} -ipc-channel = "0.4.0" +hyper = "0.9.9" +hyper_serde = "0.1.4" +ipc-channel = "0.5" plugins = {path = "../plugins"} -serde = "0.7.15" -serde_macros = "0.7.15" -url = {version = "1.0.0", features = ["heap_size", "serde"]} +serde = "0.8" +serde_macros = "0.8" +url = {version = "1.2", features = ["heap_size", "serde"]} [dependencies.webrender_traits] git = "https://github.com/servo/webrender_traits" diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs index 530bceaeb39..51e2a7635d1 100644 --- a/components/msg/constellation_msg.rs +++ b/components/msg/constellation_msg.rs @@ -191,7 +191,11 @@ pub struct Image { #[derive(Clone, Deserialize, Serialize)] pub struct LoadData { pub url: Url, + #[serde(deserialize_with = "::hyper_serde::deserialize", + serialize_with = "::hyper_serde::serialize")] pub method: Method, + #[serde(deserialize_with = "::hyper_serde::deserialize", + serialize_with = "::hyper_serde::serialize")] pub headers: Headers, pub data: Option<Vec<u8>>, pub referrer_policy: Option<ReferrerPolicy>, diff --git a/components/msg/lib.rs b/components/msg/lib.rs index 13923b16b6e..af96cb541a4 100644 --- a/components/msg/lib.rs +++ b/components/msg/lib.rs @@ -12,6 +12,7 @@ extern crate bitflags; extern crate heapsize; extern crate hyper; +extern crate hyper_serde; extern crate ipc_channel; extern crate serde; extern crate url; diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 6ee9543b265..1e7d90f10be 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -12,14 +12,15 @@ path = "lib.rs" [dependencies] bitflags = "0.7" brotli = "1.0.6" -content-blocker = "0.2" -cookie = { version = "0.2.5", features = ["serialize-serde", "serialize-rustc" ] } +content-blocker = "0.2.1" +cookie = {version = "0.2.5", features = ["serialize-rustc"]} device = {git = "https://github.com/servo/devices"} devtools_traits = {path = "../devtools_traits"} flate2 = "0.2.0" -hyper = {version = "0.9.9", features = ["serde-serialization"]} +hyper = "0.9.9" +hyper_serde = "0.1.4" immeta = "0.3.1" -ipc-channel = "0.4.0" +ipc-channel = "0.5" lazy_static = "0.2" log = "0.3.5" matches = "0.1" @@ -36,9 +37,9 @@ rustc-serialize = "0.3" threadpool = "1.0" time = "0.1.17" unicase = "1.4.0" -url = {version = "1.0.0", features = ["heap_size", "rustc-serialize"]} +url = {version = "1.2", features = ["heap_size", "rustc-serialize"]} util = {path = "../util"} -uuid = {version = "0.2", features = ["v4"]} +uuid = {version = "0.3", features = ["v4"]} websocket = "0.17" [dependencies.webrender_traits] diff --git a/components/net/about_loader.rs b/components/net/about_loader.rs index 937c2806eb3..29f598f3cdf 100644 --- a/components/net/about_loader.rs +++ b/components/net/about_loader.rs @@ -6,6 +6,7 @@ use file_loader; use hyper::header::ContentType; use hyper::http::RawStatus; use hyper::mime::{Mime, SubLevel, TopLevel}; +use hyper_serde::Serde; use mime_classifier::MimeClassifier; use net_traits::ProgressMsg::Done; use net_traits::response::HttpsState; @@ -33,10 +34,11 @@ pub fn factory(mut load_data: LoadData, "blank" => { let metadata = Metadata { final_url: load_data.url, - content_type: Some(ContentType(Mime(TopLevel::Text, SubLevel::Html, vec![]))), + content_type: + Some(Serde(ContentType(Mime(TopLevel::Text, SubLevel::Html, vec![])))), charset: Some("utf-8".to_owned()), headers: None, - status: Some(RawStatus(200, "OK".into())), + status: Some(Serde(RawStatus(200, "OK".into()))), https_state: HttpsState::None, referrer: None, }; diff --git a/components/net/blob_loader.rs b/components/net/blob_loader.rs index 0783afd979a..0c9e858be36 100644 --- a/components/net/blob_loader.rs +++ b/components/net/blob_loader.rs @@ -6,6 +6,7 @@ use filemanager_thread::{FileManager, UIProvider}; use hyper::header::{DispositionType, ContentDisposition, DispositionParam}; use hyper::header::{Headers, ContentType, ContentLength, Charset}; use hyper::http::RawStatus; +use hyper_serde::Serde; use ipc_channel::ipc; use mime::{Mime, Attr}; use mime_classifier::MimeClassifier; @@ -68,11 +69,11 @@ fn load_blob<UI: 'static + UIProvider> let metadata = Metadata { final_url: load_data.url.clone(), - content_type: Some(ContentType(content_type.clone())), + content_type: Some(Serde(ContentType(content_type.clone()))), charset: charset.map(|c| c.as_str().to_string()), - headers: Some(headers), + headers: Some(Serde(headers)), // https://w3c.github.io/FileAPI/#TwoHundredOK - status: Some(RawStatus(200, "OK".into())), + status: Some(Serde(RawStatus(200, "OK".into()))), https_state: HttpsState::None, referrer: None, }; diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs index 15aa3d28c00..e38d434b277 100644 --- a/components/net/fetch/methods.rs +++ b/components/net/fetch/methods.rs @@ -19,6 +19,7 @@ use hyper::header::{IfNoneMatch, Pragma, Location, QualityItem, Referer as Refer use hyper::method::Method; use hyper::mime::{Mime, SubLevel, TopLevel}; use hyper::status::StatusCode; +use hyper_serde::Serde; use mime_guess::guess_mime_type; use msg::constellation_msg::ReferrerPolicy; use net_traits::FetchTaskTarget; @@ -996,7 +997,8 @@ fn http_network_fetch(request: Rc<Request>, if let Some(pipeline_id) = pipeline_id { send_response_to_devtools( &sender, request_id.into(), - meta_headers, meta_status, + meta_headers.map(Serde::into_inner), + meta_status.map(Serde::into_inner), pipeline_id); } } diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs index 2f328917352..32c24600640 100644 --- a/components/net/http_loader.rs +++ b/components/net/http_loader.rs @@ -24,6 +24,7 @@ use hyper::method::Method; use hyper::mime::{Mime, SubLevel, TopLevel}; use hyper::net::Fresh; use hyper::status::{StatusClass, StatusCode}; +use hyper_serde::Serde; use ipc_channel::ipc::{self, IpcSender}; use log; use mime_classifier::MimeClassifier; @@ -1076,8 +1077,8 @@ pub fn load<A, B>(load_data: &LoadData, Some(&ContentType(ref mime)) => Some(mime), None => None }); - metadata.headers = Some(adjusted_headers); - metadata.status = Some(response.status_raw().clone()); + metadata.headers = Some(Serde(adjusted_headers)); + metadata.status = Some(Serde(response.status_raw().clone())); metadata.https_state = if doc_url.scheme() == "https" { HttpsState::Modern } else { @@ -1092,7 +1093,8 @@ pub fn load<A, B>(load_data: &LoadData, if let Some(ref chan) = devtools_chan { send_response_to_devtools( &chan, request_id, - metadata.headers.clone(), metadata.status.clone(), + metadata.headers.clone().map(Serde::into_inner), + metadata.status.clone().map(Serde::into_inner), pipeline_id); } } diff --git a/components/net/lib.rs b/components/net/lib.rs index 53efb84f6c2..120dacb27d2 100644 --- a/components/net/lib.rs +++ b/components/net/lib.rs @@ -21,6 +21,7 @@ extern crate device; extern crate devtools_traits; extern crate flate2; extern crate hyper; +extern crate hyper_serde; extern crate immeta; extern crate ipc_channel; #[macro_use] extern crate lazy_static; diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs index 411b0d22373..89bc5628a66 100644 --- a/components/net/resource_thread.rs +++ b/components/net/resource_thread.rs @@ -21,6 +21,7 @@ use http_loader::{self, HttpState}; use hyper::client::pool::Pool; use hyper::header::{ContentType, Header, SetCookie}; use hyper::mime::{Mime, SubLevel, TopLevel}; +use hyper_serde::Serde; use ipc_channel::ipc::{self, IpcReceiver, IpcSender, IpcReceiverSet}; use mime_classifier::{ApacheBugFlag, MimeClassifier, NoSniffFlag}; use net_traits::LoadContext; @@ -115,7 +116,7 @@ pub fn start_sending_sniffed_opt(start_chan: LoadConsumer, mut metadata: Metadat } let supplied_type = - metadata.content_type.as_ref().map(|&ContentType(Mime(ref toplevel, ref sublevel, _))| { + metadata.content_type.as_ref().map(|&Serde(ContentType(Mime(ref toplevel, ref sublevel, _)))| { (format!("{}", toplevel), format!("{}", sublevel)) }); let (toplevel, sublevel) = classifier.classify(context, @@ -125,7 +126,8 @@ pub fn start_sending_sniffed_opt(start_chan: LoadConsumer, mut metadata: Metadat &partial_body); let mime_tp: TopLevel = toplevel.parse().unwrap(); let mime_sb: SubLevel = sublevel.parse().unwrap(); - metadata.content_type = Some(ContentType(Mime(mime_tp, mime_sb, vec![]))); + metadata.content_type = + Some(Serde(ContentType(Mime(mime_tp, mime_sb, vec![])))); } start_sending_opt(start_chan, metadata, None) @@ -291,7 +293,7 @@ impl ResourceChannelManager { } CoreResourceMsg::GetCookiesDataForUrl(url, consumer, source) => { let mut cookie_jar = group.cookie_jar.write().unwrap(); - let cookies = cookie_jar.cookies_data_for_url(&url, source).collect(); + let cookies = cookie_jar.cookies_data_for_url(&url, source).map(Serde).collect(); consumer.send(cookies).unwrap(); } CoreResourceMsg::Cancel(res_id) => { diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml index 52877605b15..117ebe87fc9 100644 --- a/components/net_traits/Cargo.toml +++ b/components/net_traits/Cargo.toml @@ -12,17 +12,18 @@ path = "lib.rs" [dependencies] util = {path = "../util"} msg = {path = "../msg"} -ipc-channel = "0.4.0" +ipc-channel = "0.5" heapsize = "0.3.0" heapsize_plugin = "0.1.2" -hyper = { version = "0.9.9", features = [ "serde-serialization" ] } +hyper = "0.9.9" +hyper_serde = "0.1.4" image = "0.10" lazy_static = "0.2" log = "0.3.5" num-traits = "0.1.32" -serde = "0.7.15" -serde_macros = "0.7.15" -url = {version = "1.0.0", features = ["heap_size"]} +serde = "0.8" +serde_macros = "0.8" +url = {version = "1.2", features = ["heap_size"]} websocket = "0.17" -uuid = { version = "0.2.2", features = ["v4", "serde"] } -cookie = { version = "0.2.5", features = ["serialize-serde", "serialize-rustc" ] } +uuid = { version = "0.3", features = ["v4", "serde"] } +cookie = {version = "0.2.5", features = ["serialize-rustc"]} diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs index fd2973033eb..a778d3ce76b 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -15,6 +15,7 @@ extern crate cookie as cookie_rs; extern crate heapsize; extern crate hyper; +extern crate hyper_serde; extern crate image as piston_image; extern crate ipc_channel; #[allow(unused_extern_crates)] @@ -37,6 +38,7 @@ use hyper::header::{ContentType, Headers}; use hyper::http::RawStatus; use hyper::method::Method; use hyper::mime::{Attr, Mime}; +use hyper_serde::Serde; use ipc_channel::ipc::{self, IpcReceiver, IpcSender}; use msg::constellation_msg::{PipelineId, ReferrerPolicy}; use request::{Request, RequestInit}; @@ -85,8 +87,12 @@ pub enum LoadContext { #[derive(Clone, Debug, Deserialize, Serialize, HeapSizeOf)] pub struct CustomResponse { #[ignore_heap_size_of = "Defined in hyper"] + #[serde(deserialize_with = "::hyper_serde::deserialize", + serialize_with = "::hyper_serde::serialize")] pub headers: Headers, #[ignore_heap_size_of = "Defined in hyper"] + #[serde(deserialize_with = "::hyper_serde::deserialize", + serialize_with = "::hyper_serde::serialize")] pub raw_status: RawStatus, pub body: Vec<u8> } @@ -107,11 +113,17 @@ pub struct CustomResponseMediator { pub struct LoadData { pub url: Url, #[ignore_heap_size_of = "Defined in hyper"] + #[serde(deserialize_with = "::hyper_serde::deserialize", + serialize_with = "::hyper_serde::serialize")] pub method: Method, #[ignore_heap_size_of = "Defined in hyper"] + #[serde(deserialize_with = "::hyper_serde::deserialize", + serialize_with = "::hyper_serde::serialize")] /// Headers that will apply to the initial request only pub headers: Headers, #[ignore_heap_size_of = "Defined in hyper"] + #[serde(deserialize_with = "::hyper_serde::deserialize", + serialize_with = "::hyper_serde::serialize")] /// Headers that will apply to the initial request and any redirects /// Unused in fetch pub preserved_headers: Headers, @@ -378,7 +390,12 @@ pub enum WebSocketDomAction { #[derive(Deserialize, Serialize)] pub enum WebSocketNetworkEvent { - ConnectionEstablished(header::Headers, Vec<String>), + ConnectionEstablished( + #[serde(deserialize_with = "::hyper_serde::deserialize", + serialize_with = "::hyper_serde::serialize")] + header::Headers, + Vec<String> + ), MessageReceived(MessageData), Close(Option<u16>, String), Fail, @@ -407,11 +424,17 @@ pub enum CoreResourceMsg { /// Store a set of cookies for a given originating URL SetCookiesForUrl(Url, String, CookieSource), /// Store a set of cookies for a given originating URL - SetCookiesForUrlWithData(Url, Cookie, CookieSource), + SetCookiesForUrlWithData( + Url, + #[serde(deserialize_with = "::hyper_serde::deserialize", + serialize_with = "::hyper_serde::serialize")] + Cookie, + CookieSource + ), /// Retrieve the stored cookies for a given URL GetCookiesForUrl(Url, IpcSender<Option<String>>, CookieSource), /// Get a cookie by name for a given originating URL - GetCookiesDataForUrl(Url, IpcSender<Vec<Cookie>>, CookieSource), + GetCookiesDataForUrl(Url, IpcSender<Vec<Serde<Cookie>>>, CookieSource), /// Cancel a network request corresponding to a given `ResourceId` Cancel(ResourceId), /// Synchronization message solely for knowing the state of the ResourceChannelManager loop @@ -528,18 +551,18 @@ pub struct Metadata { #[ignore_heap_size_of = "Defined in hyper"] /// MIME type / subtype. - pub content_type: Option<(ContentType)>, + pub content_type: Option<Serde<ContentType>>, /// Character set. pub charset: Option<String>, #[ignore_heap_size_of = "Defined in hyper"] /// Headers - pub headers: Option<Headers>, + pub headers: Option<Serde<Headers>>, #[ignore_heap_size_of = "Defined in hyper"] /// HTTP Status - pub status: Option<RawStatus>, + pub status: Option<Serde<RawStatus>>, /// Is successful HTTPS connection pub https_state: HttpsState, @@ -557,7 +580,7 @@ impl Metadata { charset: None, headers: None, // https://fetch.spec.whatwg.org/#concept-response-status-message - status: Some(RawStatus(200, "OK".into())), + status: Some(Serde(RawStatus(200, "OK".into()))), https_state: HttpsState::None, referrer: None, } @@ -566,7 +589,7 @@ impl Metadata { /// Extract the parts of a Mime that we care about. pub fn set_content_type(&mut self, content_type: Option<&Mime>) { match self.headers { - None => self.headers = Some(Headers::new()), + None => self.headers = Some(Serde(Headers::new())), Some(_) => (), } @@ -577,7 +600,7 @@ impl Metadata { headers.set(ContentType(mime.clone())); } - self.content_type = Some(ContentType(mime.clone())); + self.content_type = Some(Serde(ContentType(mime.clone()))); let &Mime(_, _, ref parameters) = mime; for &(ref k, ref v) in parameters { if &Attr::Charset == k { diff --git a/components/net_traits/request.rs b/components/net_traits/request.rs index bf7e22d2d0b..a1bf48cbbe9 100644 --- a/components/net_traits/request.rs +++ b/components/net_traits/request.rs @@ -111,8 +111,12 @@ pub enum CORSSettings { #[derive(Serialize, Deserialize, Clone)] pub struct RequestInit { + #[serde(deserialize_with = "::hyper_serde::deserialize", + serialize_with = "::hyper_serde::serialize")] pub method: Method, pub url: Url, + #[serde(deserialize_with = "::hyper_serde::deserialize", + serialize_with = "::hyper_serde::serialize")] pub headers: Headers, pub unsafe_request: bool, pub same_origin_data: bool, diff --git a/components/net_traits/response.rs b/components/net_traits/response.rs index ab1d5b1c8f5..37b0a585780 100644 --- a/components/net_traits/response.rs +++ b/components/net_traits/response.rs @@ -7,6 +7,7 @@ use hyper::header::{AccessControlExposeHeaders, ContentType, Headers}; use hyper::http::RawStatus; use hyper::status::StatusCode; +use hyper_serde::Serde; use std::ascii::AsciiExt; use std::cell::{Cell, RefCell}; use std::sync::{Arc, Mutex}; @@ -237,8 +238,8 @@ impl Response { Some(&ContentType(ref mime)) => Some(mime), None => None }); - metadata.headers = Some(self.headers.clone()); - metadata.status = self.raw_status.clone(); + metadata.headers = Some(Serde(self.headers.clone())); + metadata.status = self.raw_status.clone().map(Serde); metadata.https_state = self.https_state; return Ok(metadata); } diff --git a/components/profile/Cargo.toml b/components/profile/Cargo.toml index e430982d57f..3ecb761474b 100644 --- a/components/profile/Cargo.toml +++ b/components/profile/Cargo.toml @@ -13,12 +13,12 @@ path = "lib.rs" profile_traits = {path = "../profile_traits"} plugins = {path = "../plugins"} util = {path = "../util", features = ["servo"]} -ipc-channel = "0.4.0" +ipc-channel = "0.5" heartbeats-simple = "0.3" log = "0.3.5" -serde = "0.7.15" -serde_json = "0.7" -serde_macros = "0.7.15" +serde = "0.8" +serde_json = "0.8" +serde_macros = "0.8" time = "0.1.12" [target.'cfg(target_os = "macos")'.dependencies] diff --git a/components/profile_traits/Cargo.toml b/components/profile_traits/Cargo.toml index 0c8f966af28..f4b3687fc08 100644 --- a/components/profile_traits/Cargo.toml +++ b/components/profile_traits/Cargo.toml @@ -13,10 +13,10 @@ path = "lib.rs" energy-profiling = ["energymon", "energy-monitor"] [dependencies] -ipc-channel = "0.4.0" +ipc-channel = "0.5" energymon = {git = "https://github.com/energymon/energymon-rust.git", optional = true} energy-monitor = {version = "0.2.0", optional = true} plugins = {path = "../plugins"} -serde = "0.7.15" -serde_macros = "0.7.15" +serde = "0.8" +serde_macros = "0.8" time = "0.1.12" diff --git a/components/range/Cargo.toml b/components/range/Cargo.toml index c9cbf2e9b50..a6a0e061e3a 100644 --- a/components/range/Cargo.toml +++ b/components/range/Cargo.toml @@ -15,5 +15,5 @@ heapsize = "0.3.0" heapsize_plugin = "0.1.2" num-traits = "0.1.32" rustc-serialize = "0.3" -serde = "0.7.15" -serde_macros = "0.7.15" +serde = "0.8" +serde_macros = "0.8" diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 83ae3e6ef91..717de7b380a 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -22,23 +22,24 @@ video-metadata = {git = "https://github.com/GuillaumeGomez/video-metadata-rs"} [dependencies] angle = {git = "https://github.com/servo/angle", branch = "servo"} -app_units = "0.2.5" +app_units = "0.3" bitflags = "0.7" canvas_traits = {path = "../canvas_traits"} caseless = "0.1.0" -cookie = { version = "0.2.5", features = ["serialize-serde", "serialize-rustc" ] } -cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]} +cookie = {version = "0.2.5", features = ["serialize-rustc"]} +cssparser = {version = "0.5.7", features = ["heap_size", "serde-serialization"]} devtools_traits = {path = "../devtools_traits"} encoding = "0.2" -euclid = "0.8.2" +euclid = "0.9" fnv = "1.0" gfx_traits = {path = "../gfx_traits"} heapsize = "0.3.6" heapsize_plugin = "0.1.2" html5ever = {version = "0.5.1", features = ["heap_size", "unstable"]} -hyper = {version = "0.9.9", features = ["serde-serialization"]} +hyper = "0.9.9" +hyper_serde = "0.1.4" image = "0.10" -ipc-channel = "0.4.0" +ipc-channel = "0.5" js = {git = "https://github.com/servo/rust-mozjs"} libc = "0.2" log = "0.3.5" @@ -47,7 +48,7 @@ mime_guess = "1.8.0" msg = {path = "../msg"} net_traits = {path = "../net_traits"} num-traits = "0.1.32" -offscreen_gl_context = "0.2.0" +offscreen_gl_context = "0.3" open = "1.1.1" phf = "0.7.16" phf_macros = "0.7.16" @@ -62,14 +63,14 @@ rustc-serialize = "0.3" script_layout_interface = {path = "../script_layout_interface"} script_traits = {path = "../script_traits"} selectors = {version = "0.8", features = ["heap_size"]} -serde = "0.7.15" +serde = "0.8" smallvec = "0.1" -string_cache = {version = "0.2.20", features = ["heap_size", "unstable"]} +string_cache = {version = "0.2.23", features = ["heap_size", "unstable"]} style = {path = "../style"} time = "0.1.12" -url = {version = "1.0.0", features = ["heap_size", "query_encoding"]} +url = {version = "1.2", features = ["heap_size", "query_encoding"]} util = {path = "../util"} -uuid = {version = "0.2", features = ["v4"]} +uuid = {version = "0.3", features = ["v4"]} websocket = "0.17" xml5ever = {version = "0.1.2", features = ["unstable"]} diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index 0d5ae4ee179..9264bcb0490 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -24,6 +24,7 @@ use encoding::all::UTF_8; use hyper::header::ContentType; use hyper::http::RawStatus; use hyper::mime::{Mime, TopLevel, SubLevel}; +use hyper_serde::Serde; use ipc_channel::ipc; use ipc_channel::router::ROUTER; use net_traits::{AsyncResponseListener, AsyncResponseTarget, Metadata, NetworkError}; @@ -282,7 +283,7 @@ impl AsyncResponseListener for StylesheetContext { fn headers_available(&mut self, metadata: Result<Metadata, NetworkError>) { self.metadata = metadata.ok(); if let Some(ref meta) = self.metadata { - if let Some(ContentType(Mime(TopLevel::Text, SubLevel::Css, _))) = meta.content_type { + if let Some(Serde(ContentType(Mime(TopLevel::Text, SubLevel::Css, _)))) = meta.content_type { } else { self.elem.root().upcast::<EventTarget>().fire_simple_event("error"); } @@ -304,7 +305,7 @@ impl AsyncResponseListener for StylesheetContext { Some(meta) => meta, None => return, }; - let is_css = metadata.content_type.map_or(false, |ContentType(Mime(top, sub, _))| + let is_css = metadata.content_type.map_or(false, |Serde(ContentType(Mime(top, sub, _)))| top == TopLevel::Text && sub == SubLevel::Css); let data = if is_css { mem::replace(&mut self.data, vec!()) } else { vec!() }; @@ -334,7 +335,7 @@ impl AsyncResponseListener for StylesheetContext { document.invalidate_stylesheets(); // FIXME: Revisit once consensus is reached at: https://github.com/whatwg/html/issues/1142 - successful = metadata.status.map_or(false, |RawStatus(code, _)| code == 200); + successful = metadata.status.map_or(false, |Serde(RawStatus(code, _))| code == 200); } if elem.parser_inserted.get() { diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 119139ae6d8..1c7a27fcef6 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -24,6 +24,7 @@ use dom::htmlsourceelement::HTMLSourceElement; use dom::mediaerror::MediaError; use dom::node::{window_from_node, document_from_node, Node, UnbindContext}; use dom::virtualmethods::VirtualMethods; +use hyper_serde::Serde; use ipc_channel::ipc; use ipc_channel::router::ROUTER; use net_traits::{AsyncResponseListener, AsyncResponseTarget, Metadata, NetworkError}; @@ -67,7 +68,7 @@ impl AsyncResponseListener for HTMLMediaElementContext { .as_ref() .and_then(|m| m.status .as_ref() - .map(|s| s.0 < 200 || s.0 >= 300)) + .map(|&Serde(ref s)| s.0 < 200 || s.0 >= 300)) .unwrap_or(false); if is_failure { // Ensure that the element doesn't receive any further notifications diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 442f3063524..6a6fe7d50b4 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -27,6 +27,7 @@ use encoding::label::encoding_from_whatwg_label; use encoding::types::{DecoderTrap, EncodingRef}; use html5ever::tree_builder::NextParserState; use hyper::http::RawStatus; +use hyper_serde::Serde; use ipc_channel::ipc; use ipc_channel::router::ROUTER; use js::jsval::UndefinedValue; @@ -158,7 +159,7 @@ impl AsyncResponseListener for ScriptContext { let status_code = self.metadata.as_ref().and_then(|m| { match m.status { - Some(RawStatus(c, _)) => Some(c), + Some(Serde(RawStatus(c, _))) => Some(c), _ => None, } }).unwrap_or(0); diff --git a/components/script/dom/servohtmlparser.rs b/components/script/dom/servohtmlparser.rs index 09ee38a1232..d4d2cbc911a 100644 --- a/components/script/dom/servohtmlparser.rs +++ b/components/script/dom/servohtmlparser.rs @@ -28,6 +28,7 @@ use html5ever::tree_builder; use html5ever::tree_builder::{TreeBuilder, TreeBuilderOpts}; use hyper::header::ContentType; use hyper::mime::{Mime, SubLevel, TopLevel}; +use hyper_serde::Serde; use js::jsapi::JSTracer; use msg::constellation_msg::{PipelineId, SubpageId}; use net_traits::{AsyncResponseListener, Metadata, NetworkError}; @@ -98,7 +99,8 @@ impl AsyncResponseListener for ParserContext { }, Err(_) => None, }; - let content_type = metadata.clone().and_then(|meta| meta.content_type); + let content_type = + metadata.clone().and_then(|meta| meta.content_type).map(Serde::into_inner); let parser = match ScriptThread::page_headers_available(&self.id, self.subpage.as_ref(), metadata) { diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 1d58e118cf4..382e4c69faa 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -39,6 +39,7 @@ use hyper::header::{ContentLength, ContentType}; use hyper::http::RawStatus; use hyper::method::Method; use hyper::mime::{self, Mime, Attr as MimeAttr, Value as MimeValue}; +use hyper_serde::Serde; use ipc_channel::ipc; use ipc_channel::router::ROUTER; use js::jsapi::JS_ClearPendingException; @@ -875,7 +876,10 @@ impl XMLHttpRequest { *self.response_url.borrow_mut() = metadata.final_url[..Position::AfterQuery].to_owned(); // XXXManishearth Clear cache entries in case of a network error - self.process_partial_response(XHRProgress::HeadersReceived(gen_id, metadata.headers, metadata.status)); + self.process_partial_response(XHRProgress::HeadersReceived( + gen_id, + metadata.headers.map(Serde::into_inner), + metadata.status.map(Serde::into_inner))); Ok(()) } diff --git a/components/script/lib.rs b/components/script/lib.rs index 2eecac4d1b5..87abf732bc1 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -48,6 +48,7 @@ extern crate gfx_traits; extern crate heapsize; extern crate html5ever; extern crate hyper; +extern crate hyper_serde; extern crate image; extern crate ipc_channel; #[macro_use] diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index c7e7dde4ad3..4dd3a3fba7f 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -55,6 +55,7 @@ use hyper::header::{ContentType, Headers, HttpDate, LastModified}; use hyper::header::{ReferrerPolicy as ReferrerPolicyHeader}; use hyper::method::Method; use hyper::mime::{Mime, SubLevel, TopLevel}; +use hyper_serde::Serde; use ipc_channel::ipc::{self, IpcSender}; use ipc_channel::router::ROUTER; use js::glue::GetWindowProxyClass; @@ -1695,7 +1696,7 @@ impl ScriptThread { headers.get().map(|&LastModified(HttpDate(ref tm))| dom_last_modified(tm)) }); - let content_type = metadata.content_type.as_ref().and_then(|&ContentType(ref mimetype)| { + let content_type = metadata.content_type.as_ref().and_then(|&Serde(ContentType(ref mimetype))| { match *mimetype { Mime(TopLevel::Application, SubLevel::Xml, _) | Mime(TopLevel::Application, SubLevel::Ext(_), _) | @@ -1710,8 +1711,8 @@ impl ScriptThread { Some(incomplete.url.clone())); let is_html_document = match metadata.content_type { - Some(ContentType(Mime(TopLevel::Application, SubLevel::Xml, _))) | - Some(ContentType(Mime(TopLevel::Text, SubLevel::Xml, _))) => + Some(Serde(ContentType(Mime(TopLevel::Application, SubLevel::Xml, _)))) | + Some(Serde(ContentType(Mime(TopLevel::Text, SubLevel::Xml, _)))) => IsHTMLDocument::NonHTMLDocument, _ => IsHTMLDocument::HTMLDocument, }; @@ -1797,11 +1798,11 @@ impl ScriptThread { document.set_https_state(metadata.https_state); let is_xml = match metadata.content_type { - Some(ContentType(Mime(TopLevel::Application, SubLevel::Ext(ref sub_level), _))) + Some(Serde(ContentType(Mime(TopLevel::Application, SubLevel::Ext(ref sub_level), _)))) if sub_level.ends_with("+xml") => true, - Some(ContentType(Mime(TopLevel::Application, SubLevel::Xml, _))) | - Some(ContentType(Mime(TopLevel::Text, SubLevel::Xml, _))) => true, + Some(Serde(ContentType(Mime(TopLevel::Application, SubLevel::Xml, _)))) | + Some(Serde(ContentType(Mime(TopLevel::Text, SubLevel::Xml, _)))) => true, _ => false, }; diff --git a/components/script/webdriver_handlers.rs b/components/script/webdriver_handlers.rs index 74a754c36ce..2d55345d324 100644 --- a/components/script/webdriver_handlers.rs +++ b/components/script/webdriver_handlers.rs @@ -27,6 +27,7 @@ use dom::window::ScriptHelpers; use euclid::point::Point2D; use euclid::rect::Rect; use euclid::size::Size2D; +use hyper_serde::Serde; use ipc_channel::ipc::{self, IpcSender}; use js::jsapi::{JSContext, HandleValue}; use js::jsval::UndefinedValue; @@ -194,7 +195,7 @@ pub fn handle_get_active_element(context: &BrowsingContext, pub fn handle_get_cookies(context: &BrowsingContext, _pipeline: PipelineId, - reply: IpcSender<Vec<Cookie>>) { + reply: IpcSender<Vec<Serde<Cookie>>>) { let document = context.active_document(); let url = document.url(); let (sender, receiver) = ipc::channel().unwrap(); @@ -209,7 +210,7 @@ pub fn handle_get_cookies(context: &BrowsingContext, pub fn handle_get_cookie(context: &BrowsingContext, _pipeline: PipelineId, name: String, - reply: IpcSender<Vec<Cookie>>) { + reply: IpcSender<Vec<Serde<Cookie>>>) { let document = context.active_document(); let url = document.url(); let (sender, receiver) = ipc::channel().unwrap(); diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml index 6465bdd4e26..6fb2a27786b 100644 --- a/components/script_layout_interface/Cargo.toml +++ b/components/script_layout_interface/Cargo.toml @@ -10,15 +10,15 @@ name = "script_layout_interface" path = "lib.rs" [dependencies] -app_units = "0.2.5" +app_units = "0.3" bitflags = "0.7" canvas_traits = {path = "../canvas_traits"} -cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]} -euclid = "0.8.2" +cssparser = {version = "0.5.7", features = ["heap_size", "serde-serialization"]} +euclid = "0.9" gfx_traits = {path = "../gfx_traits"} heapsize = "0.3.0" heapsize_plugin = "0.1.2" -ipc-channel = "0.4.0" +ipc-channel = "0.5" libc = "0.2" log = "0.3.5" msg = {path = "../msg"} @@ -28,7 +28,7 @@ profile_traits = {path = "../profile_traits"} range = {path = "../range"} script_traits = {path = "../script_traits"} selectors = {version = "0.8", features = ["heap_size"]} -string_cache = {version = "0.2.20", features = ["heap_size"]} +string_cache = {version = "0.2.23", features = ["heap_size"]} style = {path = "../style"} -url = {version = "1.0.0", features = ["heap_size"]} +url = {version = "1.2", features = ["heap_size"]} util = {path = "../util"} diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml index 86c0361481d..5e9b1877c3e 100644 --- a/components/script_traits/Cargo.toml +++ b/components/script_traits/Cargo.toml @@ -10,26 +10,27 @@ name = "script_traits" path = "lib.rs" [dependencies] -app_units = "0.2.5" +app_units = "0.3" canvas_traits = {path = "../canvas_traits"} -cookie = { version = "0.2.5", features = ["serialize-rustc", "serialize-serde"]} +cookie = {version = "0.2.5", features = ["serialize-rustc"]} devtools_traits = {path = "../devtools_traits"} -euclid = "0.8.2" +euclid = "0.9" gfx_traits = {path = "../gfx_traits"} heapsize = "0.3.0" heapsize_plugin = "0.1.2" -ipc-channel = "0.4.0" +hyper_serde = "0.1.4" +ipc-channel = "0.5" layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]} libc = "0.2" msg = {path = "../msg"} net_traits = {path = "../net_traits"} -offscreen_gl_context = "0.2.0" +offscreen_gl_context = "0.3" plugins = {path = "../plugins"} profile_traits = {path = "../profile_traits"} rustc-serialize = "0.3.4" -serde = "0.7.15" -serde_macros = "0.7.15" +serde = "0.8" +serde_macros = "0.8" style_traits = {path = "../style_traits", features = ["servo"]} time = "0.1.12" -url = {version = "1.0.0", features = ["heap_size"]} +url = {version = "1.2", features = ["heap_size"]} util = {path = "../util"} diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 0bc9225d42c..aa61920e32b 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -18,6 +18,7 @@ extern crate devtools_traits; extern crate euclid; extern crate gfx_traits; extern crate heapsize; +extern crate hyper_serde; extern crate ipc_channel; extern crate layers; extern crate libc; diff --git a/components/script_traits/webdriver_msg.rs b/components/script_traits/webdriver_msg.rs index 09d3c9e9e1c..788dbd5ad36 100644 --- a/components/script_traits/webdriver_msg.rs +++ b/components/script_traits/webdriver_msg.rs @@ -6,6 +6,7 @@ use cookie_rs::Cookie; use euclid::rect::Rect; +use hyper_serde::Serde; use ipc_channel::ipc::IpcSender; use msg::constellation_msg::PipelineId; use rustc_serialize::json::{Json, ToJson}; @@ -13,15 +14,20 @@ use url::Url; #[derive(Deserialize, Serialize)] pub enum WebDriverScriptCommand { - AddCookie(Cookie, IpcSender<Result<(), WebDriverCookieError>>), + AddCookie( + #[serde(deserialize_with = "::hyper_serde::deserialize", + serialize_with = "::hyper_serde::serialize")] + Cookie, + IpcSender<Result<(), WebDriverCookieError>> + ), ExecuteScript(String, IpcSender<WebDriverJSResult>), ExecuteAsyncScript(String, IpcSender<WebDriverJSResult>), FindElementCSS(String, IpcSender<Result<Option<String>, ()>>), FindElementsCSS(String, IpcSender<Result<Vec<String>, ()>>), FocusElement(String, IpcSender<Result<(), ()>>), GetActiveElement(IpcSender<Option<String>>), - GetCookie(String, IpcSender<Vec<Cookie>>), - GetCookies(IpcSender<Vec<Cookie>>), + GetCookie(String, IpcSender<Vec<Serde<Cookie>>>), + GetCookies(IpcSender<Vec<Serde<Cookie>>>), GetElementAttribute(String, String, IpcSender<Result<Option<String>, ()>>), GetElementCSS(String, String, IpcSender<Result<String, ()>>), GetElementRect(String, IpcSender<Result<Rect<f64>, ()>>), diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 403ce92897f..3b1678bd7dc 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.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "backtrace 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "browserhtml 0.1.15 (git+https://github.com/browserhtml/browserhtml?branch=crate)", "canvas 0.0.1", "canvas_traits 0.0.1", @@ -13,13 +13,13 @@ dependencies = [ "devtools 0.0.1", "devtools_traits 0.0.1", "env_logger 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", "gfx_tests 0.0.1", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "glutin_app 0.0.1", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "layout 0.0.1", "layout_tests 0.0.1", "layout_thread 0.0.1", @@ -41,12 +41,12 @@ dependencies = [ "sig 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_tests 0.0.1", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "util_tests 0.0.1", "webdriver_server 0.0.1", - "webrender 0.1.0 (git+https://github.com/servo/webrender)", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender 0.2.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] @@ -69,21 +69,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "angle" -version = "0.1.0" -source = "git+https://github.com/servo/angle?branch=servo#d0a2db05d1ada8e38b0143a5846f68089f332e9e" +version = "0.1.1" +source = "git+https://github.com/servo/angle?branch=servo#832ffd74ac892682dfcaea27dc518130a72e280c" dependencies = [ + "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "app_units" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -102,29 +103,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "azure" -version = "0.6.2" -source = "git+https://github.com/servo/rust-azure#6e028b5fafc1dad4cd48e233a9760cb67937d487" +version = "0.7.1" +source = "git+https://github.com/servo/rust-azure#d5ca43ba0e1e0fc33832060728d7ed60520541f8" dependencies = [ "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-text 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 4.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-skia 0.20130412.19 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-skia 0.20130412.21 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "backtrace" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "backtrace-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -147,13 +148,13 @@ dependencies = [ [[package]] name = "bincode" -version = "0.5.9" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -175,6 +176,11 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "blurz" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -205,35 +211,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "canvas" version = "0.0.1" dependencies = [ - "azure 0.6.2 (git+https://github.com/servo/rust-azure)", + "azure 0.7.1 (git+https://github.com/servo/rust-azure)", "canvas_traits 0.0.1", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "util 0.0.1", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] name = "canvas_traits" version = "0.0.1" dependencies = [ - "azure 0.6.2 (git+https://github.com/servo/rust-azure)", - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.7.1 (git+https://github.com/servo/rust-azure)", + "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] @@ -269,11 +275,12 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.4.4" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -302,70 +309,70 @@ dependencies = [ name = "compositing" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.6.2 (git+https://github.com/servo/rust-azure)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.7.1 (git+https://github.com/servo/rust-azure)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "layers 0.3.1 (git+https://github.com/servo/rust-layers)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "layers 0.4.0 (git+https://github.com/servo/rust-layers)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", "plugins 0.0.1", "profile_traits 0.0.1", "script_traits 0.0.1", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "webrender 0.1.0 (git+https://github.com/servo/webrender)", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender 0.2.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] name = "constellation" version = "0.0.1" dependencies = [ - "backtrace 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "canvas 0.0.1", "canvas_traits 0.0.1", "compositing 0.0.1", "devtools_traits 0.0.1", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", "gfx_traits 0.0.1", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "layers 0.3.1 (git+https://github.com/servo/rust-layers)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "layers 0.4.0 (git+https://github.com/servo/rust-layers)", "layout_traits 0.0.1", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "offscreen_gl_context 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] name = "content-blocker" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "regex 0.1.71 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -375,9 +382,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "openssl 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -399,21 +405,21 @@ dependencies = [ [[package]] name = "core-graphics" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "core-text" -version = "1.1.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -424,15 +430,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cssparser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -483,13 +487,14 @@ version = "0.0.1" dependencies = [ "devtools_traits 0.0.1", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "plugins 0.0.1", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -502,12 +507,13 @@ dependencies = [ "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -519,6 +525,11 @@ dependencies = [ ] [[package]] +name = "dtoa" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "dwmapi-sys" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -652,14 +663,14 @@ dependencies = [ [[package]] name = "euclid" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -745,26 +756,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "gfx" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.6.2 (git+https://github.com/servo/rust-azure)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.7.1 (git+https://github.com/servo/rust-azure)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-text 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "gfx_traits 0.0.1", "harfbuzz-sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "layers 0.3.1 (git+https://github.com/servo/rust-layers)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "layers 0.4.0 (git+https://github.com/servo/rust-layers)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", "ordered-float 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -773,19 +784,19 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "range 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "simd 0.1.0 (git+https://github.com/huonw/simd)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", "xi-unicode 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -794,7 +805,7 @@ name = "gfx_tests" version = "0.0.1" dependencies = [ "gfx 0.0.1", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", ] @@ -802,18 +813,18 @@ dependencies = [ name = "gfx_traits" version = "0.0.1" dependencies = [ - "azure 0.6.2 (git+https://github.com/servo/rust-azure)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.7.1 (git+https://github.com/servo/rust-azure)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "layers 0.3.1 (git+https://github.com/servo/rust-layers)", + "layers 0.4.0 (git+https://github.com/servo/rust-layers)", "msg 0.0.1", "plugins 0.0.1", "profile_traits 0.0.1", "range 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -854,18 +865,18 @@ version = "0.0.1" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - "layers 0.3.1 (git+https://github.com/servo/rust-layers)", + "layers 0.4.0 (git+https://github.com/servo/rust-layers)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", "script_traits 0.0.1", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "winapi 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -943,7 +954,7 @@ dependencies = [ "phf 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -962,18 +973,28 @@ dependencies = [ "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-verify 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", "solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (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)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "hyper_serde" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1019,12 +1040,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "io-surface" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "leaky-cow 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1032,18 +1053,23 @@ dependencies = [ [[package]] name = "ipc-channel" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bincode 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "bincode 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] +name = "itoa" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "jpeg-decoder" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1086,22 +1112,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "layers" -version = "0.3.1" -source = "git+https://github.com/servo/rust-layers#c1965cf7a265f758c34e57413506f508969248a0" +version = "0.4.0" +source = "git+https://github.com/servo/rust-layers#614d62f48a258cd94f6cf2c6500cd7801e340981" dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "io-surface 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "io-surface 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-skia 0.20130412.19 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-skia 0.20130412.21 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1109,18 +1135,18 @@ dependencies = [ name = "layout" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.6.2 (git+https://github.com/servo/rust-azure)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.7.1 (git+https://github.com/servo/rust-azure)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -1133,16 +1159,16 @@ dependencies = [ "script_layout_interface 0.0.1", "script_traits 0.0.1", "selectors 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", "unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] @@ -1156,15 +1182,15 @@ dependencies = [ name = "layout_thread" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.6.2 (git+https://github.com/servo/rust-azure)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.7.1 (git+https://github.com/servo/rust-azure)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "layout 0.0.1", "layout_traits 0.0.1", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1175,12 +1201,12 @@ dependencies = [ "script 0.0.1", "script_layout_interface 0.0.1", "script_traits 0.0.1", - "serde_json 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] @@ -1188,14 +1214,14 @@ name = "layout_traits" version = "0.0.1" dependencies = [ "gfx 0.0.1", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", "profile_traits 0.0.1", "script_traits 0.0.1", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] @@ -1308,11 +1334,11 @@ dependencies = [ [[package]] name = "mime" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1320,7 +1346,7 @@ name = "mime_guess" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1349,16 +1375,17 @@ name = "msg" version = "0.0.1" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] @@ -1367,18 +1394,19 @@ version = "0.0.1" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "brotli 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "content-blocker 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "content-blocker 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "device 0.0.1 (git+https://github.com/servo/devices)", "devtools_traits 0.0.1", "flate2 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "immeta 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", @@ -1392,10 +1420,10 @@ dependencies = [ "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "uuid 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1415,12 +1443,13 @@ dependencies = [ name = "net_tests" version = "0.0.1" dependencies = [ - "content-blocker 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "content-blocker 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", "flate2 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net 0.0.1", "net_traits 0.0.1", @@ -1428,7 +1457,7 @@ dependencies = [ "profile_traits 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1440,17 +1469,18 @@ dependencies = [ "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1546,17 +1576,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "offscreen_gl_context" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1714,15 +1744,15 @@ name = "profile" version = "0.0.1" dependencies = [ "heartbeats-simple 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "regex 0.1.71 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "task_info 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1732,7 +1762,7 @@ dependencies = [ name = "profile_tests" version = "0.0.1" dependencies = [ - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "profile 0.0.1", "profile_traits 0.0.1", ] @@ -1743,10 +1773,10 @@ version = "0.0.1" dependencies = [ "energy-monitor 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "energymon 0.2.0 (git+https://github.com/energymon/energymon-rust.git)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1796,8 +1826,8 @@ dependencies = [ "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1864,33 +1894,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "script" version = "0.0.1" dependencies = [ - "angle 0.1.0 (git+https://github.com/servo/angle?branch=servo)", - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "angle 0.1.1 (git+https://github.com/servo/angle?branch=servo)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "caseless 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.7 (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.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "js 0.1.3 (git+https://github.com/servo/rust-mozjs)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "open 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1905,17 +1936,17 @@ dependencies = [ "script_layout_interface 0.0.1", "script_traits 0.0.1", "selectors 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "video-metadata 0.1.3 (git+https://github.com/GuillaumeGomez/video-metadata-rs)", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1924,15 +1955,15 @@ dependencies = [ name = "script_layout_interface" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -1942,9 +1973,9 @@ dependencies = [ "range 0.0.1", "script_traits 0.0.1", "selectors 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1955,35 +1986,36 @@ dependencies = [ "msg 0.0.1", "plugins 0.0.1", "script 0.0.1", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "script_traits" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "layers 0.3.1 (git+https://github.com/servo/rust-layers)", + "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "layers 0.4.0 (git+https://github.com/servo/rust-layers)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "offscreen_gl_context 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1993,14 +2025,14 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quickersort 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2010,40 +2042,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "0.7.15" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_codegen" -version = "0.7.15" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "aster 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", "quasi 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "quasi_macros 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_codegen_internals 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_codegen_internals 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_codegen_internals" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_json" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "dtoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_macros" -version = "0.7.15" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_codegen 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_codegen 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2084,14 +2118,14 @@ dependencies = [ [[package]] name = "servo-glutin" -version = "0.4.25" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "cocoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2113,21 +2147,21 @@ dependencies = [ [[package]] name = "servo-skia" -version = "0.20130412.19" +version = "0.20130412.21" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "expat-sys 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "io-surface 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "io-surface 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig-sys 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 4.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2175,28 +2209,27 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "phf_generator 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "style" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2211,13 +2244,13 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "walkdir 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2226,15 +2259,15 @@ dependencies = [ name = "style_tests" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -2242,13 +2275,13 @@ dependencies = [ name = "style_traits" version = "0.0.1" dependencies = [ - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2385,16 +2418,15 @@ dependencies = [ [[package]] name = "url" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2423,20 +2455,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "util" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "xdg 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2449,11 +2481,11 @@ dependencies = [ [[package]] name = "uuid" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2549,61 +2581,61 @@ name = "webdriver_server" version = "0.0.1" dependencies = [ "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "plugins 0.0.1", "regex 0.1.71 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "webdriver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "webrender" -version = "0.1.0" -source = "git+https://github.com/servo/webrender#2c25e910b2a1f0399c57a077085d5cc3451f4499" +version = "0.2.0" +source = "git+https://github.com/servo/webrender#c84b6eb466dc6802b2b85cff481a5a08a9efadc1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-text 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "scoped_threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] name = "webrender_traits" -version = "0.2.1" -source = "git+https://github.com/servo/webrender_traits#75d40708694949a2e092ff4c344f952e3afbaa55" +version = "0.3.0" +source = "git+https://github.com/servo/webrender_traits#4d5036748208733dbdad43b7faec27ccccbce9a6" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2619,7 +2651,7 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2687,7 +2719,7 @@ dependencies = [ "phf 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index ef1d487c978..0e0782ac83f 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -52,11 +52,11 @@ constellation = {path = "../constellation"} devtools = {path = "../devtools"} devtools_traits = {path = "../devtools_traits"} env_logger = "0.3" -euclid = "0.8.2" +euclid = "0.9" gfx = {path = "../gfx"} gleam = "0.2" glutin_app = {path = "../../ports/glutin"} -ipc-channel = "0.4.0" +ipc-channel = "0.5" layout = {path = "../layout"} layout_thread = {path = "../layout_thread"} libc = "0.2" @@ -70,7 +70,7 @@ script = {path = "../script"} script_layout_interface = {path = "../script_layout_interface"} script_traits = {path = "../script_traits"} style = {path = "../style", features = ["servo"]} -url = "1.0.0" +url = "1.2" util = {path = "../util"} webdriver_server = {path = "../webdriver_server", optional = true} diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index db0e441f13d..21fcc15ede0 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -13,19 +13,19 @@ path = "lib.rs" [features] gecko = ["gecko_bindings", "gecko_string_cache"] -servo = ["serde", "serde/nightly", "serde_macros", "heapsize", "heapsize_plugin", - "style_traits/servo", "app_units/plugins", "euclid/plugins", +servo = ["serde", "serde/unstable", "serde_macros", "heapsize", "heapsize_plugin", + "style_traits/servo", "app_units/plugins", "cssparser/heap_size", "cssparser/serde-serialization", "selectors/heap_size", "selectors/unstable", "string_cache", "url/heap_size", "plugins"] [dependencies] -app_units = "0.2.5" +app_units = "0.3" bitflags = "0.7" -cssparser = "0.5.5" +cssparser = "0.5.7" deque = "0.3.1" encoding = "0.2" -euclid = "0.8.2" +euclid = "0.9" fnv = "1.0" gecko_bindings = {path = "../../ports/geckolib/gecko_bindings", optional = true} gecko_string_cache = {path = "../../ports/geckolib/string_cache", optional = true} @@ -39,13 +39,13 @@ ordered-float = "0.2.2" rand = "0.3" rustc-serialize = "0.3" selectors = "0.8.2" -serde = {version = "0.7.15", optional = true} -serde_macros = {version = "0.7.15", optional = true} +serde = {version = "0.8", optional = true} +serde_macros = {version = "0.8", optional = true} smallvec = "0.1" -string_cache = {version = "0.2.22", features = ["heap_size"], optional = true} +string_cache = {version = "0.2.23", features = ["heap_size"], optional = true} style_traits = {path = "../style_traits"} time = "0.1" -url = "1.0.0" +url = "1.2" util = {path = "../util"} plugins = {path = "../plugins", optional = true} diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml index d7ee9514580..49117af86fa 100644 --- a/components/style_traits/Cargo.toml +++ b/components/style_traits/Cargo.toml @@ -14,10 +14,10 @@ servo = ["heapsize", "heapsize_plugin", "serde", "serde_macros", "cssparser/heap_size", "cssparser/serde-serialization"] [dependencies] -cssparser = "0.5.4" -euclid = "0.8.2" +cssparser = "0.5.7" +euclid = "0.9" heapsize = {version = "0.3.0", optional = true} heapsize_plugin = {version = "0.1.2", optional = true} rustc-serialize = "0.3" -serde = {version = "0.7.11", optional = true} -serde_macros = {version = "0.7.11", optional = true} +serde = {version = "0.8", optional = true} +serde_macros = {version = "0.8", optional = true} diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml index e03464b7fb9..394f8e25a07 100644 --- a/components/util/Cargo.toml +++ b/components/util/Cargo.toml @@ -15,19 +15,19 @@ servo = ["serde", "serde_macros", "ipc-channel", "app_units/plugins", "euclid/unstable", "url/heap_size", "url/serde", "plugins"] [dependencies] -app_units = "0.2.5" +app_units = "0.3" bitflags = "0.7" -euclid = "0.8.2" +euclid = "0.9" getopts = "0.2.11" heapsize = "0.3.0" -ipc-channel = {version = "0.4.0", optional = true} +ipc-channel = {version = "0.5", optional = true} lazy_static = "0.2" log = "0.3.5" num_cpus = "0.2.2" rustc-serialize = "0.3" -serde = {version = "0.7.11", optional = true} -serde_macros = {version = "0.7.11", optional = true} -url = "1.0.0" +serde = {version = "0.8", optional = true} +serde_macros = {version = "0.8", optional = true} +url = "1.2" plugins = {path = "../plugins", optional = true} [dev-dependencies] diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml index 5265dddc010..8c9c5fbde32 100644 --- a/components/webdriver_server/Cargo.toml +++ b/components/webdriver_server/Cargo.toml @@ -10,18 +10,18 @@ name = "webdriver_server" path = "lib.rs" [dependencies] -euclid = "0.8.2" +euclid = "0.9" hyper = "0.9.9" image = "0.10" -ipc-channel = "0.4.0" +ipc-channel = "0.5" log = "0.3.5" msg = {path = "../msg"} plugins = {path = "../plugins"} regex = "0.1.55" rustc-serialize = "0.3.4" script_traits = {path = "../script_traits"} -url = {version = "1.0.0", features = ["heap_size"]} +url = {version = "1.2", features = ["heap_size"]} util = {path = "../util"} -uuid = { version = "0.2", features = ["v4"] } +uuid = { version = "0.3", features = ["v4"] } webdriver = "0.9" -cookie = { version = "0.2.5", features = ["serialize-serde", "serialize-rustc" ] } +cookie = {version = "0.2.5", features = ["serialize-rustc"]} diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index eaa76dca177..ed38d1933a9 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -643,7 +643,7 @@ impl Handler { try!(self.frame_script_command(WebDriverScriptCommand::GetCookies(sender))); let cookies = receiver.recv().unwrap(); let response = cookies.into_iter().map(|cookie| { - cookie_msg_to_cookie(cookie) + cookie_msg_to_cookie(cookie.into_inner()) }).collect::<Vec<Cookie>>(); Ok(WebDriverResponse::Cookie(CookieResponse::new(response))) } @@ -653,7 +653,7 @@ impl Handler { try!(self.frame_script_command(WebDriverScriptCommand::GetCookie(name.to_owned(), sender))); let cookies = receiver.recv().unwrap(); let response = cookies.into_iter().map(|cookie| { - cookie_msg_to_cookie(cookie) + cookie_msg_to_cookie(cookie.into_inner()) }).collect::<Vec<Cookie>>(); Ok(WebDriverResponse::Cookie(CookieResponse::new(response))) } diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 15436157ce9..488b531127b 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -2,13 +2,13 @@ name = "embedding" version = "0.0.1" dependencies = [ - "cocoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", "devtools 0.0.1", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "glutin_app 0.0.1", - "layers 0.3.1 (git+https://github.com/servo/rust-layers)", + "layers 0.4.0 (git+https://github.com/servo/rust-layers)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -18,7 +18,7 @@ dependencies = [ "script_traits 0.0.1", "servo 0.0.1", "style_traits 0.0.1", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "x11 2.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -43,21 +43,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "angle" -version = "0.1.0" -source = "git+https://github.com/servo/angle?branch=servo#d0a2db05d1ada8e38b0143a5846f68089f332e9e" +version = "0.1.1" +source = "git+https://github.com/servo/angle?branch=servo#832ffd74ac892682dfcaea27dc518130a72e280c" dependencies = [ + "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "app_units" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -76,29 +77,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "azure" -version = "0.6.2" -source = "git+https://github.com/servo/rust-azure#6e028b5fafc1dad4cd48e233a9760cb67937d487" +version = "0.7.1" +source = "git+https://github.com/servo/rust-azure#d5ca43ba0e1e0fc33832060728d7ed60520541f8" dependencies = [ "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-text 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 4.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-skia 0.20130412.19 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-skia 0.20130412.21 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "backtrace" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "backtrace-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -121,13 +122,13 @@ dependencies = [ [[package]] name = "bincode" -version = "0.5.9" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -149,6 +150,11 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "blurz" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -179,35 +185,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "canvas" version = "0.0.1" dependencies = [ - "azure 0.6.2 (git+https://github.com/servo/rust-azure)", + "azure 0.7.1 (git+https://github.com/servo/rust-azure)", "canvas_traits 0.0.1", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "util 0.0.1", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] name = "canvas_traits" version = "0.0.1" dependencies = [ - "azure 0.6.2 (git+https://github.com/servo/rust-azure)", - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.7.1 (git+https://github.com/servo/rust-azure)", + "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] @@ -243,11 +249,12 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.4.4" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -261,70 +268,70 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "compositing" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.6.2 (git+https://github.com/servo/rust-azure)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.7.1 (git+https://github.com/servo/rust-azure)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "layers 0.3.1 (git+https://github.com/servo/rust-layers)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "layers 0.4.0 (git+https://github.com/servo/rust-layers)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", "plugins 0.0.1", "profile_traits 0.0.1", "script_traits 0.0.1", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "webrender 0.1.0 (git+https://github.com/servo/webrender)", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender 0.2.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] name = "constellation" version = "0.0.1" dependencies = [ - "backtrace 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "canvas 0.0.1", "canvas_traits 0.0.1", "compositing 0.0.1", "devtools_traits 0.0.1", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", "gfx_traits 0.0.1", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "layers 0.3.1 (git+https://github.com/servo/rust-layers)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "layers 0.4.0 (git+https://github.com/servo/rust-layers)", "layout_traits 0.0.1", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "offscreen_gl_context 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] name = "content-blocker" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "regex 0.1.71 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -334,9 +341,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "openssl 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -358,21 +364,21 @@ dependencies = [ [[package]] name = "core-graphics" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "core-text" -version = "1.1.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -383,15 +389,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cssparser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -442,13 +446,14 @@ version = "0.0.1" dependencies = [ "devtools_traits 0.0.1", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "plugins 0.0.1", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -461,12 +466,13 @@ dependencies = [ "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -478,6 +484,11 @@ dependencies = [ ] [[package]] +name = "dtoa" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "dwmapi-sys" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -570,14 +581,14 @@ dependencies = [ [[package]] name = "euclid" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -663,26 +674,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "gfx" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.6.2 (git+https://github.com/servo/rust-azure)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.7.1 (git+https://github.com/servo/rust-azure)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-text 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "gfx_traits 0.0.1", "harfbuzz-sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "layers 0.3.1 (git+https://github.com/servo/rust-layers)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "layers 0.4.0 (git+https://github.com/servo/rust-layers)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", "ordered-float 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -691,19 +702,19 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "range 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "simd 0.1.0 (git+https://github.com/huonw/simd)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", "xi-unicode 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -711,18 +722,18 @@ dependencies = [ name = "gfx_traits" version = "0.0.1" dependencies = [ - "azure 0.6.2 (git+https://github.com/servo/rust-azure)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.7.1 (git+https://github.com/servo/rust-azure)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "layers 0.3.1 (git+https://github.com/servo/rust-layers)", + "layers 0.4.0 (git+https://github.com/servo/rust-layers)", "msg 0.0.1", "plugins 0.0.1", "profile_traits 0.0.1", "range 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -763,18 +774,18 @@ version = "0.0.1" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - "layers 0.3.1 (git+https://github.com/servo/rust-layers)", + "layers 0.4.0 (git+https://github.com/servo/rust-layers)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", "script_traits 0.0.1", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "winapi 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -852,7 +863,7 @@ dependencies = [ "phf 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -871,18 +882,28 @@ dependencies = [ "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-verify 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", "solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (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)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "hyper_serde" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -928,12 +949,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "io-surface" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "leaky-cow 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -941,18 +962,23 @@ dependencies = [ [[package]] name = "ipc-channel" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bincode 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "bincode 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] +name = "itoa" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "jpeg-decoder" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -995,22 +1021,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "layers" -version = "0.3.1" -source = "git+https://github.com/servo/rust-layers#c1965cf7a265f758c34e57413506f508969248a0" +version = "0.4.0" +source = "git+https://github.com/servo/rust-layers#614d62f48a258cd94f6cf2c6500cd7801e340981" dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "io-surface 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "io-surface 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-skia 0.20130412.19 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-skia 0.20130412.21 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1018,18 +1044,18 @@ dependencies = [ name = "layout" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.6.2 (git+https://github.com/servo/rust-azure)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.7.1 (git+https://github.com/servo/rust-azure)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -1042,31 +1068,31 @@ dependencies = [ "script_layout_interface 0.0.1", "script_traits 0.0.1", "selectors 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", "unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] name = "layout_thread" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.6.2 (git+https://github.com/servo/rust-azure)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.7.1 (git+https://github.com/servo/rust-azure)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "layout 0.0.1", "layout_traits 0.0.1", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1077,12 +1103,12 @@ dependencies = [ "script 0.0.1", "script_layout_interface 0.0.1", "script_traits 0.0.1", - "serde_json 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] @@ -1090,14 +1116,14 @@ name = "layout_traits" version = "0.0.1" dependencies = [ "gfx 0.0.1", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", "profile_traits 0.0.1", "script_traits 0.0.1", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] @@ -1210,11 +1236,11 @@ dependencies = [ [[package]] name = "mime" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1222,7 +1248,7 @@ name = "mime_guess" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1251,16 +1277,17 @@ name = "msg" version = "0.0.1" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] @@ -1269,18 +1296,19 @@ version = "0.0.1" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "brotli 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "content-blocker 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "content-blocker 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "device 0.0.1 (git+https://github.com/servo/devices)", "devtools_traits 0.0.1", "flate2 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "immeta 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", @@ -1294,10 +1322,10 @@ dependencies = [ "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "uuid 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1321,17 +1349,18 @@ dependencies = [ "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1420,17 +1449,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "offscreen_gl_context" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1579,15 +1608,15 @@ name = "profile" version = "0.0.1" dependencies = [ "heartbeats-simple 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "regex 0.1.71 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "task_info 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1597,10 +1626,10 @@ dependencies = [ name = "profile_traits" version = "0.0.1" dependencies = [ - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1650,8 +1679,8 @@ dependencies = [ "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1718,33 +1747,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "script" version = "0.0.1" dependencies = [ - "angle 0.1.0 (git+https://github.com/servo/angle?branch=servo)", - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "angle 0.1.1 (git+https://github.com/servo/angle?branch=servo)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "caseless 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.7 (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.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "js 0.1.3 (git+https://github.com/servo/rust-mozjs)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "open 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1759,17 +1789,17 @@ dependencies = [ "script_layout_interface 0.0.1", "script_traits 0.0.1", "selectors 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "video-metadata 0.1.3 (git+https://github.com/GuillaumeGomez/video-metadata-rs)", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1778,15 +1808,15 @@ dependencies = [ name = "script_layout_interface" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -1796,9 +1826,9 @@ dependencies = [ "range 0.0.1", "script_traits 0.0.1", "selectors 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1806,28 +1836,29 @@ dependencies = [ name = "script_traits" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "layers 0.3.1 (git+https://github.com/servo/rust-layers)", + "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "layers 0.4.0 (git+https://github.com/servo/rust-layers)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "offscreen_gl_context 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1837,14 +1868,14 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quickersort 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1854,40 +1885,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "0.7.15" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_codegen" -version = "0.7.15" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "aster 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", "quasi 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "quasi_macros 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_codegen_internals 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_codegen_internals 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_codegen_internals" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_json" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "dtoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_macros" -version = "0.7.15" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_codegen 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_codegen 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1895,7 +1928,7 @@ name = "servo" version = "0.0.1" dependencies = [ "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "backtrace 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "browserhtml 0.1.15 (git+https://github.com/browserhtml/browserhtml?branch=crate)", "canvas 0.0.1", "canvas_traits 0.0.1", @@ -1904,12 +1937,12 @@ dependencies = [ "devtools 0.0.1", "devtools_traits 0.0.1", "env_logger 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "glutin_app 0.0.1", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "layout 0.0.1", "layout_thread 0.0.1", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1924,11 +1957,11 @@ dependencies = [ "script_traits 0.0.1", "sig 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webdriver_server 0.0.1", - "webrender 0.1.0 (git+https://github.com/servo/webrender)", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender 0.2.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] @@ -1969,14 +2002,14 @@ dependencies = [ [[package]] name = "servo-glutin" -version = "0.4.25" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "cocoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1998,21 +2031,21 @@ dependencies = [ [[package]] name = "servo-skia" -version = "0.20130412.19" +version = "0.20130412.21" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "expat-sys 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "io-surface 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "io-surface 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig-sys 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 4.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2060,28 +2093,27 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "phf_generator 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "style" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2096,13 +2128,13 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "walkdir 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2111,13 +2143,13 @@ dependencies = [ name = "style_traits" version = "0.0.1" dependencies = [ - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2254,16 +2286,15 @@ dependencies = [ [[package]] name = "url" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2292,30 +2323,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "util" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "xdg 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "uuid" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2411,61 +2442,61 @@ name = "webdriver_server" version = "0.0.1" dependencies = [ "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "plugins 0.0.1", "regex 0.1.71 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "webdriver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "webrender" -version = "0.1.0" -source = "git+https://github.com/servo/webrender#2c25e910b2a1f0399c57a077085d5cc3451f4499" +version = "0.2.0" +source = "git+https://github.com/servo/webrender#c84b6eb466dc6802b2b85cff481a5a08a9efadc1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-text 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "scoped_threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.2.1 (git+https://github.com/servo/webrender_traits)", + "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] name = "webrender_traits" -version = "0.2.1" -source = "git+https://github.com/servo/webrender_traits#75d40708694949a2e092ff4c344f952e3afbaa55" +version = "0.3.0" +source = "git+https://github.com/servo/webrender_traits#4d5036748208733dbdad43b7faec27ccccbce9a6" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2481,7 +2512,7 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2549,7 +2580,7 @@ dependencies = [ "phf 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/cef/Cargo.toml b/ports/cef/Cargo.toml index 884dc604ae7..5d8ac59b1a4 100644 --- a/ports/cef/Cargo.toml +++ b/ports/cef/Cargo.toml @@ -17,7 +17,7 @@ opt-level = 3 [dependencies] compositing = {path = "../../components/compositing"} devtools = {path = "../../components/devtools"} -euclid = "0.8.2" +euclid = "0.9" gleam = "0.2.8" glutin_app = {path = "../glutin"} layers = {git = "https://github.com/servo/rust-layers"} @@ -29,12 +29,12 @@ plugins = {path = "../../components/plugins"} script_traits = {path = "../../components/script_traits"} servo = {path = "../../components/servo"} style_traits = {path = "../../components/style_traits"} -url = "1.0.0" +url = "1.2" util = {path = "../../components/util"} [target.'cfg(target_os="macos")'.dependencies] objc = "0.2" -cocoa = "0.4" +cocoa = "0.5" [target.'cfg(target_os="linux")'.dependencies] x11 = "2.3" diff --git a/ports/geckolib/Cargo.lock b/ports/geckolib/Cargo.lock index 66625474174..571177b0e70 100644 --- a/ports/geckolib/Cargo.lock +++ b/ports/geckolib/Cargo.lock @@ -2,9 +2,9 @@ name = "geckoservo" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gecko_bindings 0.0.1", "gecko_string_cache 0.2.20", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -14,7 +14,7 @@ dependencies = [ "selectors 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -28,13 +28,13 @@ dependencies = [ [[package]] name = "app_units" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -49,7 +49,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cssparser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -140,14 +140,14 @@ dependencies = [ [[package]] name = "euclid" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -171,7 +171,7 @@ dependencies = [ "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -315,17 +315,17 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quickersort 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde" -version = "0.7.15" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -335,26 +335,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "string_cache" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "phf_generator 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "style" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "gecko_bindings 0.0.1", "gecko_string_cache 0.2.20", @@ -371,7 +371,7 @@ dependencies = [ "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "walkdir 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -380,8 +380,8 @@ dependencies = [ name = "style_traits" version = "0.0.1" dependencies = [ - "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -435,7 +435,7 @@ dependencies = [ [[package]] name = "url" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -451,16 +451,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "util" version = "0.0.1" dependencies = [ - "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "xdg 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/geckolib/Cargo.toml b/ports/geckolib/Cargo.toml index c27446c4f8b..472401147d7 100644 --- a/ports/geckolib/Cargo.toml +++ b/ports/geckolib/Cargo.toml @@ -10,9 +10,9 @@ path = "lib.rs" crate-type = ["staticlib"] [dependencies] -app_units = "0.2.5" +app_units = "0.3" env_logger = "0.3" -euclid = "0.8.2" +euclid = "0.9" gecko_bindings = {version = "0.0.1", path = "gecko_bindings"} gecko_string_cache = {path = "string_cache"} lazy_static = "0.2" @@ -22,5 +22,5 @@ num_cpus = "0.2.2" selectors = "0.8" style = {path = "../../components/style", features = ["gecko"]} style_traits = {path = "../../components/style_traits"} -url = "1.0.0" +url = "1.2" util = {path = "../../components/util"} diff --git a/ports/geckolib/string_cache/Cargo.toml b/ports/geckolib/string_cache/Cargo.toml index 8a7402bbd74..070c9968148 100644 --- a/ports/geckolib/string_cache/Cargo.toml +++ b/ports/geckolib/string_cache/Cargo.toml @@ -15,4 +15,4 @@ gecko_bindings = {version = "0.0.1", path = "../gecko_bindings"} heapsize = "0.3.5" libc = "0.2" selectors = "0.8" -serde = "0.7.15" +serde = "0.8" diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml index 1e9cbac3642..35886e7a5ee 100644 --- a/ports/glutin/Cargo.toml +++ b/ports/glutin/Cargo.toml @@ -11,16 +11,16 @@ path = "lib.rs" [dependencies] bitflags = "0.7" compositing = {path = "../../components/compositing"} -euclid = "0.8.2" +euclid = "0.9" gleam = "0.2.8" layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]} log = "0.3.5" msg = {path = "../../components/msg"} net_traits = {path = "../../components/net_traits"} script_traits = {path = "../../components/script_traits"} -servo-glutin = "0.4" +servo-glutin = "0.5" style_traits = {path = "../../components/style_traits"} -url = {version = "1.0.0", features = ["heap_size"]} +url = {version = "1.2", features = ["heap_size"]} util = {path = "../../components/util"} [target.'cfg(target_os = "linux")'.dependencies] diff --git a/tests/unit/gfx/Cargo.toml b/tests/unit/gfx/Cargo.toml index 060bb09b01e..87075b177e1 100644 --- a/tests/unit/gfx/Cargo.toml +++ b/tests/unit/gfx/Cargo.toml @@ -11,5 +11,5 @@ doctest = false [dependencies] gfx = {path = "../../../components/gfx"} -ipc-channel = "0.4.0" +ipc-channel = "0.5" style = {path = "../../../components/style"} diff --git a/tests/unit/net/Cargo.toml b/tests/unit/net/Cargo.toml index 3f87e8fe429..1c9a275e445 100644 --- a/tests/unit/net/Cargo.toml +++ b/tests/unit/net/Cargo.toml @@ -10,12 +10,13 @@ path = "lib.rs" doctest = false [dependencies] -content-blocker = "0.2" +content-blocker = "0.2.1" cookie = "0.2" devtools_traits = {path = "../../../components/devtools_traits"} flate2 = "0.2.0" hyper = "0.9.9" -ipc-channel = "0.4.0" +hyper_serde = "0.1.4" +ipc-channel = "0.5" msg = {path = "../../../components/msg"} net = {path = "../../../components/net"} net_traits = {path = "../../../components/net_traits"} @@ -23,5 +24,5 @@ plugins = {path = "../../../components/plugins"} profile_traits = {path = "../../../components/profile_traits"} time = "0.1" unicase = "1.0" -url = {version = "1.0.0", features = ["heap_size"]} +url = {version = "1.2", features = ["heap_size"]} util = {path = "../../../components/util"} diff --git a/tests/unit/net/data_loader.rs b/tests/unit/net/data_loader.rs index f73331a53be..2916cb7e30c 100644 --- a/tests/unit/net/data_loader.rs +++ b/tests/unit/net/data_loader.rs @@ -3,7 +3,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ extern crate hyper; +extern crate hyper_serde; +use hyper_serde::Serde; use ipc_channel::ipc; use msg::constellation_msg::{PipelineId, ReferrerPolicy}; use net_traits::LoadConsumer::Channel; @@ -44,7 +46,8 @@ fn assert_parse(url: &'static str, classifier, CancellationListener::new(None)); let response = start_port.recv().unwrap(); - assert_eq!(&response.metadata.content_type, &content_type); + assert_eq!(&response.metadata.content_type.map(Serde::into_inner), + &content_type); assert_eq!(&response.metadata.charset, &charset); let progress = response.progress_port.recv().unwrap(); diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index 53f79178aab..e8e44789cf0 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -18,6 +18,7 @@ use hyper::http::RawStatus; use hyper::method::Method; use hyper::mime::{Mime, SubLevel, TopLevel}; use hyper::status::StatusCode; +use hyper_serde::Serde; use msg::constellation_msg::{PipelineId, ReferrerPolicy}; use net::cookie::Cookie; use net::cookie_storage::CookieStorage; @@ -1584,7 +1585,8 @@ fn test_auth_ui_sets_header_on_401() { }, DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None), None) { Err(e) => panic!("response contained error {:?}", e), Ok(response) => { - assert_eq!(response.metadata.status, Some(RawStatus(200, Cow::Borrowed("Ok")))); + assert_eq!(response.metadata.status, + Some(Serde(RawStatus(200, Cow::Borrowed("Ok"))))); } } } @@ -1618,7 +1620,8 @@ fn test_auth_ui_needs_www_auth() { match response { Err(e) => panic!("response contained error {:?}", e), Ok(response) => { - assert_eq!(response.metadata.status, Some(RawStatus(401, Cow::Borrowed("Unauthorized")))); + assert_eq!(response.metadata.status, + Some(Serde(RawStatus(401, Cow::Borrowed("Unauthorized"))))); } } } @@ -1944,7 +1947,7 @@ fn load_request_for_custom_response(expected_body: Vec<u8>) -> (Metadata, String fn test_custom_response() { let expected_body = b"Yay!".to_vec(); let (metadata, body) = load_request_for_custom_response(expected_body.clone()); - assert_eq!(metadata.status, Some(RawStatus(200, Cow::Borrowed("OK")))); + assert_eq!(metadata.status, Some(Serde(RawStatus(200, Cow::Borrowed("OK"))))); assert_eq!(body, String::from_utf8(expected_body).unwrap()); } diff --git a/tests/unit/net/lib.rs b/tests/unit/net/lib.rs index 7923ede897d..1acdb9bb6ae 100644 --- a/tests/unit/net/lib.rs +++ b/tests/unit/net/lib.rs @@ -10,6 +10,7 @@ extern crate cookie as cookie_rs; extern crate devtools_traits; extern crate flate2; extern crate hyper; +extern crate hyper_serde; extern crate ipc_channel; extern crate msg; extern crate net; diff --git a/tests/unit/profile/Cargo.toml b/tests/unit/profile/Cargo.toml index 0c79370271c..515a0a2fa17 100644 --- a/tests/unit/profile/Cargo.toml +++ b/tests/unit/profile/Cargo.toml @@ -12,4 +12,4 @@ doctest = false [dependencies] profile = {path = "../../../components/profile"} profile_traits = {path = "../../../components/profile_traits"} -ipc-channel = "0.4.0" +ipc-channel = "0.5" diff --git a/tests/unit/script/Cargo.toml b/tests/unit/script/Cargo.toml index 0d784863261..4a4e0c96d6b 100644 --- a/tests/unit/script/Cargo.toml +++ b/tests/unit/script/Cargo.toml @@ -13,4 +13,4 @@ doctest = false msg = {path = "../../../components/msg"} plugins = {path = "../../../components/plugins"} script = {path = "../../../components/script"} -url = {version = "1.0.0", features = ["heap_size"]} +url = {version = "1.2", features = ["heap_size"]} diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml index ee1465af0a7..3d048e4f070 100644 --- a/tests/unit/style/Cargo.toml +++ b/tests/unit/style/Cargo.toml @@ -10,13 +10,13 @@ path = "lib.rs" doctest = false [dependencies] -app_units = "0.2.5" -cssparser = {version = "0.5.4", features = ["heap_size"]} -euclid = "0.8.2" +app_units = "0.3" +cssparser = {version = "0.5.7", features = ["heap_size"]} +euclid = "0.9" rustc-serialize = "0.3" selectors = {version = "0.8", features = ["heap_size"]} -string_cache = {version = "0.2", features = ["heap_size"]} +string_cache = {version = "0.2.23", features = ["heap_size"]} style = {path = "../../../components/style"} style_traits = {path = "../../../components/style_traits"} -url = {version = "1.0.0", features = ["heap_size"]} +url = {version = "1.2", features = ["heap_size"]} util = {path = "../../../components/util"} |