diff options
32 files changed, 316 insertions, 229 deletions
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index 0c027195b25..b9fea313f32 100644 --- a/components/compositing/Cargo.toml +++ b/components/compositing/Cargo.toml @@ -48,6 +48,7 @@ git = "https://github.com/servo/rust-layers" [dependencies.png] git = "https://github.com/servo/rust-png" +features = [ "serde-serialization" ] [dependencies.clipboard] git = "https://github.com/aweinstock314/rust-clipboard" @@ -58,7 +59,7 @@ git = "https://github.com/pcwalton/ipc-channel" [dependencies] log = "*" num = "0.1.24" -url = "0.2.35" +url = "0.2.36" time = "0.1.17" libc = "*" gleam = "0.1" diff --git a/components/compositing/compositor_task.rs b/components/compositing/compositor_task.rs index d8ada04bbdf..b9738685f6b 100644 --- a/components/compositing/compositor_task.rs +++ b/components/compositing/compositor_task.rs @@ -13,7 +13,7 @@ use windowing::{WindowEvent, WindowMethods}; use euclid::point::Point2D; use euclid::rect::Rect; -use ipc_channel::ipc::IpcReceiver; +use ipc_channel::ipc::{IpcReceiver, IpcSender}; use layers::platform::surface::NativeDisplay; use layers::layers::{BufferRequest, LayerBuffer, LayerBufferSet}; use msg::compositor_msg::{Epoch, LayerId, LayerProperties, FrameTreeId}; @@ -183,7 +183,7 @@ pub enum Msg { /// Changes the cursor. SetCursor(Cursor), /// Composite to a PNG file and return the Image over a passed channel. - CreatePng(Sender<Option<png::Image>>), + CreatePng(IpcSender<Option<png::Image>>), /// Informs the compositor that the paint task for the given pipeline has exited. PaintTaskExited(PipelineId), /// Alerts the compositor that the viewport has been constrained in some manner diff --git a/components/compositing/constellation.rs b/components/compositing/constellation.rs index b7498ccf843..7dd06342790 100644 --- a/components/compositing/constellation.rs +++ b/components/compositing/constellation.rs @@ -19,7 +19,7 @@ use euclid::rect::{Rect, TypedRect}; use euclid::size::Size2D; use euclid::scale_factor::ScaleFactor; use gfx::font_cache_task::FontCacheTask; -use ipc_channel::ipc; +use ipc_channel::ipc::{self, IpcSender}; use layout_traits::{LayoutControlChan, LayoutTaskFactory}; use libc; use msg::compositor_msg::{Epoch, LayerId}; @@ -44,7 +44,7 @@ use std::collections::HashMap; use std::io::{self, Write}; use std::marker::PhantomData; use std::mem::replace; -use std::sync::mpsc::{Sender, Receiver, channel}; +use std::sync::mpsc::{Receiver, channel}; use style::viewport::ViewportConstraints; use url::Url; use util::cursor::Cursor; @@ -191,7 +191,7 @@ pub struct SendableFrameTree { } struct WebDriverData { - load_channel: Option<(PipelineId, Sender<webdriver_msg::LoadStatus>)> + load_channel: Option<(PipelineId, IpcSender<webdriver_msg::LoadStatus>)> } impl WebDriverData { @@ -849,7 +849,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> { } fn handle_get_pipeline(&mut self, frame_id: Option<FrameId>, - resp_chan: Sender<Option<PipelineId>>) { + resp_chan: IpcSender<Option<PipelineId>>) { let current_pipeline_id = frame_id.or(self.root_frame_id).map(|frame_id| { let frame = self.frames.get(&frame_id).unwrap(); frame.current @@ -863,7 +863,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> { fn handle_get_frame(&mut self, containing_pipeline_id: PipelineId, subpage_id: SubpageId, - resp_chan: Sender<Option<FrameId>>) { + resp_chan: IpcSender<Option<FrameId>>) { let frame_id = self.subpage_map.get(&(containing_pipeline_id, subpage_id)).and_then( |x| self.pipeline_to_frame_map.get(&x)).map(|x| *x); resp_chan.send(frame_id).unwrap(); diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml index 63cba3ccfe3..ac16535dcd8 100644 --- a/components/devtools/Cargo.toml +++ b/components/devtools/Cargo.toml @@ -7,6 +7,10 @@ authors = ["The Servo Project Developers"] name = "devtools" path = "lib.rs" +[dependencies.hyper] +version = "0.6" +features = [ "serde-serialization" ] + [dependencies.devtools_traits] path = "../devtools_traits" @@ -20,5 +24,4 @@ path = "../util" log = "*" time = "*" rustc-serialize = "0.3" -url = "*" -hyper = "0.6" +url = "0.2" diff --git a/components/devtools_traits/Cargo.toml b/components/devtools_traits/Cargo.toml index 9cdd5d1311a..1dc3cfdc4a1 100644 --- a/components/devtools_traits/Cargo.toml +++ b/components/devtools_traits/Cargo.toml @@ -7,6 +7,10 @@ authors = ["The Servo Project Developers"] name = "devtools_traits" path = "lib.rs" +[dependencies.hyper] +version = "0.6" +features = [ "serde-serialization" ] + [dependencies.msg] path = "../msg" @@ -16,6 +20,5 @@ path = "../util" [dependencies] time = "*" rustc-serialize = "0.3" -url = "*" -hyper = "0.6" +url = "0.2" bitflags = "*" diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index b0376d7e335..eaf53aac46b 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -47,7 +47,7 @@ path = "../script_traits" [dependencies] log = "*" fnv = "1.0" -url = "0.2.35" +url = "0.2.36" time = "0.1.12" bitflags = "*" rustc-serialize = "0.3" diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 5feddfb72eb..526c1f73a7f 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -62,7 +62,7 @@ git = "https://github.com/pcwalton/ipc-channel" log = "*" encoding = "0.2" fnv = "1.0" -url = "0.2.35" +url = "0.2.36" bitflags = "*" rustc-serialize = "0.3" libc = "*" diff --git a/components/layout_traits/Cargo.toml b/components/layout_traits/Cargo.toml index 94f3b9d0498..e7b0c54d998 100644 --- a/components/layout_traits/Cargo.toml +++ b/components/layout_traits/Cargo.toml @@ -29,7 +29,7 @@ path = "../util" git = "https://github.com/pcwalton/ipc-channel" [dependencies] -url = "0.2.35" +url = "0.2.36" euclid = "0.1" serde = "*" serde_macros = "*" diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index fefc32ef5b0..d645bddb58b 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -21,14 +21,21 @@ git = "https://github.com/servo/rust-layers" [dependencies.png] git = "https://github.com/servo/rust-png" +features = [ "serde-serialization" ] + +[dependencies.hyper] +version = "0.6" +features = [ "serde-serialization" ] + +[dependencies.url] +version = "0.2.36" +features = [ "serde_serialization" ] [dependencies.ipc-channel] git = "https://github.com/pcwalton/ipc-channel" [dependencies] -url = "0.2.35" bitflags = "*" -hyper = "0.6" rustc-serialize = "0.3.4" euclid = "0.1" serde = "*" diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs index 662e1bed34a..52b883615e5 100644 --- a/components/msg/constellation_msg.rs +++ b/components/msg/constellation_msg.rs @@ -6,13 +6,15 @@ //! reduce coupling between these two components. use compositor_msg::Epoch; + use euclid::rect::Rect; use euclid::size::TypedSize2D; use euclid::scale_factor::ScaleFactor; use hyper::header::Headers; use hyper::method::Method; +use ipc_channel::ipc::IpcSender; use layers::geometry::DevicePixel; -use png; +use png::Image; use util::cursor::Cursor; use util::geometry::{PagePx, ViewportPx}; use std::collections::HashMap; @@ -31,20 +33,20 @@ impl ConstellationChan { } } -#[derive(PartialEq, Eq, Copy, Clone, Debug)] +#[derive(PartialEq, Eq, Copy, Clone, Debug, Deserialize, Serialize)] pub enum IFrameSandboxState { IFrameSandboxed, IFrameUnsandboxed } // We pass this info to various tasks, so it lives in a separate, cloneable struct. -#[derive(Clone, Copy)] +#[derive(Clone, Copy, Deserialize, Serialize)] pub struct Failure { pub pipeline_id: PipelineId, pub parent_info: Option<(PipelineId, SubpageId)>, } -#[derive(Copy, Clone)] +#[derive(Copy, Clone, Deserialize, Serialize)] pub struct WindowSizeData { /// The size of the initial layout viewport, before parsing an /// http://www.w3.org/TR/css-device-adapt/#initial-viewport @@ -209,6 +211,7 @@ pub enum FocusType { } /// Messages from the compositor and script to the constellation. +#[derive(Deserialize, Serialize)] pub enum Msg { Exit, Failure(Failure), @@ -234,14 +237,14 @@ pub enum Msg { TickAnimation(PipelineId), /// Request that the constellation send the current pipeline id for the provided frame /// id, or for the root frame if this is None, over a provided channel - GetPipeline(Option<FrameId>, Sender<Option<PipelineId>>), + GetPipeline(Option<FrameId>, IpcSender<Option<PipelineId>>), /// Request that the constellation send the FrameId corresponding to the document /// with the provided parent pipeline id and subpage id - GetFrame(PipelineId, SubpageId, Sender<Option<FrameId>>), + GetFrame(PipelineId, SubpageId, IpcSender<Option<FrameId>>), /// Notifies the constellation that this frame has received focus. Focus(PipelineId), /// Requests that the constellation retrieve the current contents of the clipboard - GetClipboardContents(Sender<String>), + GetClipboardContents(IpcSender<String>), /// Dispatch a webdriver command WebDriverCommand(WebDriverCommandMsg), /// Notifies the constellation that the viewport has been constrained in some manner @@ -256,7 +259,7 @@ pub enum Msg { HeadParsed, } -#[derive(Clone, Eq, PartialEq)] +#[derive(Clone, Eq, PartialEq, Deserialize, Serialize)] pub enum AnimationState { AnimationsPresent, AnimationCallbacksPresent, @@ -265,6 +268,7 @@ pub enum AnimationState { } // https://developer.mozilla.org/en-US/docs/Web/API/Using_the_Browser_API#Events +#[derive(Deserialize, Serialize)] pub enum MozBrowserEvent { /// Sent when the scroll position within a browser <iframe> changes. AsyncScroll, @@ -329,16 +333,17 @@ impl MozBrowserEvent { } } +#[derive(Deserialize, Serialize)] pub enum WebDriverCommandMsg { - LoadUrl(PipelineId, LoadData, Sender<LoadStatus>), + LoadUrl(PipelineId, LoadData, IpcSender<LoadStatus>), ScriptCommand(PipelineId, WebDriverScriptCommand), - TakeScreenshot(PipelineId, Sender<Option<png::Image>>) + TakeScreenshot(PipelineId, IpcSender<Option<Image>>) } /// Similar to net::resource_task::LoadData /// can be passed to LoadUrl to load a page with GET/POST /// parameters or headers -#[derive(Clone)] +#[derive(Clone, Deserialize, Serialize)] pub struct LoadData { pub url: Url, pub method: Method, @@ -357,16 +362,16 @@ impl LoadData { } } -#[derive(Clone, PartialEq, Eq, Copy, Hash, Debug)] +#[derive(Clone, PartialEq, Eq, Copy, Hash, Debug, Deserialize, Serialize)] pub enum NavigationDirection { Forward, Back, } -#[derive(Clone, PartialEq, Eq, Copy, Hash, Debug)] +#[derive(Clone, PartialEq, Eq, Copy, Hash, Debug, Deserialize, Serialize)] pub struct FrameId(pub u32); -#[derive(Clone, PartialEq, Eq, Copy, Hash, Debug)] +#[derive(Clone, PartialEq, Eq, Copy, Hash, Debug, Deserialize, Serialize)] pub struct WorkerId(pub u32); #[derive(Clone, PartialEq, Eq, Copy, Hash, Debug, Deserialize, Serialize)] diff --git a/components/msg/webdriver_msg.rs b/components/msg/webdriver_msg.rs index bc57f58fa28..0c2d8860a96 100644 --- a/components/msg/webdriver_msg.rs +++ b/components/msg/webdriver_msg.rs @@ -2,23 +2,25 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use rustc_serialize::json::{Json, ToJson}; use constellation_msg::{PipelineId, SubpageId}; -use std::sync::mpsc::Sender; +use ipc_channel::ipc::IpcSender; +use rustc_serialize::json::{Json, ToJson}; +#[derive(Deserialize, Serialize)] pub enum WebDriverScriptCommand { - ExecuteScript(String, Sender<WebDriverJSResult>), - ExecuteAsyncScript(String, Sender<WebDriverJSResult>), - FindElementCSS(String, Sender<Result<Option<String>, ()>>), - FindElementsCSS(String, Sender<Result<Vec<String>, ()>>), - GetActiveElement(Sender<Option<String>>), - GetElementTagName(String, Sender<Result<String, ()>>), - GetElementText(String, Sender<Result<String, ()>>), - GetFrameId(WebDriverFrameId, Sender<Result<Option<(PipelineId, SubpageId)>, ()>>), - GetTitle(Sender<String>) + ExecuteScript(String, IpcSender<WebDriverJSResult>), + ExecuteAsyncScript(String, IpcSender<WebDriverJSResult>), + FindElementCSS(String, IpcSender<Result<Option<String>, ()>>), + FindElementsCSS(String, IpcSender<Result<Vec<String>, ()>>), + GetActiveElement(IpcSender<Option<String>>), + GetElementTagName(String, IpcSender<Result<String, ()>>), + GetElementText(String, IpcSender<Result<String, ()>>), + GetFrameId(WebDriverFrameId, IpcSender<Result<Option<(PipelineId, SubpageId)>, ()>>), + GetTitle(IpcSender<String>) } +#[derive(Deserialize, Serialize)] pub enum WebDriverJSValue { Undefined, Null, @@ -28,6 +30,7 @@ pub enum WebDriverJSValue { // TODO: Object and WebElement } +#[derive(Deserialize, Serialize)] pub enum WebDriverJSError { Timeout, UnknownType @@ -35,6 +38,7 @@ pub enum WebDriverJSError { pub type WebDriverJSResult = Result<WebDriverJSValue, WebDriverJSError>; +#[derive(Deserialize, Serialize)] pub enum WebDriverFrameId { Short(u16), Element(String), @@ -53,6 +57,7 @@ impl ToJson for WebDriverJSValue { } } +#[derive(Deserialize, Serialize)] pub enum LoadStatus { LoadComplete, LoadTimeout diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 17d3ee06d61..6773518e864 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -18,17 +18,21 @@ path = "../devtools_traits" [dependencies.png] git = "https://github.com/servo/rust-png" +features = [ "serde-serialization" ] + +[dependencies.hyper] +version = "0.6" +features = [ "serde-serialization" ] [dependencies] log = "*" -url = "0.2.35" +url = "0.2.36" time = "0.1.17" openssl="0.6.1" rustc-serialize = "0.3" cookie="*" regex = "0.1.14" regex_macros = "0.1.8" -hyper = "0.6" flate2 = "0.2.0" uuid = "0.1.16" euclid = "0.1" diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml index 0cf033bd1bd..d16deebf4f3 100644 --- a/components/net_traits/Cargo.toml +++ b/components/net_traits/Cargo.toml @@ -9,6 +9,7 @@ path = "lib.rs" [dependencies.png] git = "https://github.com/servo/rust-png" +features = [ "serde-serialization" ] [dependencies.util] path = "../util" @@ -19,10 +20,13 @@ path = "../msg" [dependencies.stb_image] git = "https://github.com/servo/rust-stb-image" +[dependencies.hyper] +version = "0.6" +features = [ "serde-serialization" ] + [dependencies] log = "*" -url = "0.2.35" -hyper = "0.6" +url = "0.2.36" euclid = "0.1" serde = "*" serde_macros = "*" diff --git a/components/profile_traits/Cargo.toml b/components/profile_traits/Cargo.toml index e7f5f275b79..509565deb4b 100644 --- a/components/profile_traits/Cargo.toml +++ b/components/profile_traits/Cargo.toml @@ -9,5 +9,5 @@ path = "lib.rs" [dependencies] time = "0.1.12" -url = "0.2.35" +url = "0.2.36" diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 0731d06b1be..a06eabe8875 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -52,8 +52,8 @@ git = "https://github.com/servo/rust-selectors" git = "https://github.com/servo/rust-mozjs" [dependencies.url] -version = "0.2.33" -features = ["query_encoding"] +version = "0.2.36" +features = ["query_encoding", "serde_serialization"] [dependencies.offscreen_gl_context] git = "https://github.com/ecoal95/rust-offscreen-rendering-context" @@ -61,6 +61,10 @@ git = "https://github.com/ecoal95/rust-offscreen-rendering-context" [dependencies.ipc-channel] git = "https://github.com/pcwalton/ipc-channel" +[dependencies.hyper] +version = "0.6" +features = [ "serde-serialization" ] + [dependencies] log = "*" encoding = "0.2" @@ -69,7 +73,6 @@ time = "0.1.12" bitflags = "*" rustc-serialize = "*" libc = "*" -hyper = "0.6" cssparser = "0.3.1" unicase = "0.1" num = "0.1.24" @@ -82,3 +85,4 @@ string_cache_plugin = "0.1" euclid = "0.1" tendril = "0.1.1" rand = "0.3" +serde = "*" diff --git a/components/script/clipboard_provider.rs b/components/script/clipboard_provider.rs index af67919125b..facdf4aca14 100644 --- a/components/script/clipboard_provider.rs +++ b/components/script/clipboard_provider.rs @@ -5,6 +5,7 @@ use msg::constellation_msg::ConstellationChan; use msg::constellation_msg::Msg as ConstellationMsg; +use ipc_channel::ipc; use std::borrow::ToOwned; use std::sync::mpsc::channel; @@ -17,7 +18,7 @@ pub trait ClipboardProvider { impl ClipboardProvider for ConstellationChan { fn clipboard_contents(&mut self) -> String { - let (tx, rx) = channel(); + let (tx, rx) = ipc::channel().unwrap(); self.0.send(ConstellationMsg::GetClipboardContents(tx)).unwrap(); rx.recv().unwrap() } diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 5ed5ed0bb52..f7f8c527d9a 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -45,6 +45,7 @@ use euclid::size::Size2D; use html5ever::tree_builder::QuirksMode; use hyper::header::Headers; use hyper::method::Method; +use ipc_channel::ipc::IpcSender; use js::jsapi::{JSObject, JSTracer, JSGCTraceKind, JS_CallValueTracer, JS_CallObjectTracer, GCTraceKindToAscii, Heap}; use js::jsapi::JS_CallUnbarrieredObjectTracer; use js::jsval::JSVal; @@ -61,6 +62,7 @@ use msg::compositor_msg::ScriptListener; use msg::constellation_msg::ConstellationChan; use net_traits::image::base::Image; use profile_traits::mem::ProfilerChan; +use serde::Serialize; use util::str::{LengthOrPercentageOrAuto}; use std::cell::{Cell, UnsafeCell, RefCell}; use std::collections::{HashMap, HashSet}; @@ -344,6 +346,13 @@ impl JSTraceable for Box<LayoutRPC+'static> { } } +impl<T> JSTraceable for IpcSender<T> where T: Serialize { + #[inline] + fn trace(&self, _: *mut JSTracer) { + // Do nothing + } +} + impl JSTraceable for () { #[inline] fn trace(&self, _trc: *mut JSTracer) { diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 845f7ea7521..9eca84edac4 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -51,6 +51,7 @@ use util::opts; use util::str::{DOMString,HTML_SPACE_CHARACTERS}; use euclid::{Point2D, Rect, Size2D}; +use ipc_channel::ipc::IpcSender; use js::jsapi::{Evaluate2, MutableHandleValue}; use js::jsapi::{JSContext, HandleValue}; use js::jsapi::{JS_GC, JS_GetRuntime, JSAutoCompartment, JSAutoRequest}; @@ -185,7 +186,7 @@ pub struct Window { pending_reflow_count: Cell<u32>, /// A channel for communicating results of async scripts back to the webdriver server - webdriver_script_chan: RefCell<Option<Sender<WebDriverJSResult>>>, + webdriver_script_chan: RefCell<Option<IpcSender<WebDriverJSResult>>>, /// The current state of the window object current_state: Cell<WindowState>, @@ -562,7 +563,7 @@ pub trait WindowHelpers { fn emit_timeline_marker(self, marker: TimelineMarker); fn set_devtools_timeline_marker(self, marker: TimelineMarkerType, reply: Sender<TimelineMarker>); fn drop_devtools_timeline_markers(self); - fn set_webdriver_script_chan(self, chan: Option<Sender<WebDriverJSResult>>); + fn set_webdriver_script_chan(self, chan: Option<IpcSender<WebDriverJSResult>>); fn is_alive(self) -> bool; fn parent(self) -> Option<Root<Window>>; } @@ -945,7 +946,7 @@ impl<'a> WindowHelpers for &'a Window { *self.devtools_marker_sender.borrow_mut() = None; } - fn set_webdriver_script_chan(self, chan: Option<Sender<WebDriverJSResult>>) { + fn set_webdriver_script_chan(self, chan: Option<IpcSender<WebDriverJSResult>>) { *self.webdriver_script_chan.borrow_mut() = chan; } diff --git a/components/script/lib.rs b/components/script/lib.rs index 80390b3a429..c57c0de7998 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -53,6 +53,7 @@ extern crate net_traits; extern crate num; extern crate rustc_serialize; extern crate rustc_unicode; +extern crate serde; extern crate time; extern crate canvas; extern crate canvas_traits; diff --git a/components/script/webdriver_handlers.rs b/components/script/webdriver_handlers.rs index c724b1b7348..591e38eb52b 100644 --- a/components/script/webdriver_handlers.rs +++ b/components/script/webdriver_handlers.rs @@ -22,8 +22,8 @@ use script_task::get_page; use js::jsapi::{RootedValue, HandleValue}; use js::jsval::UndefinedValue; +use ipc_channel::ipc::IpcSender; use std::rc::Rc; -use std::sync::mpsc::Sender; fn find_node_by_unique_id(page: &Rc<Page>, pipeline: PipelineId, node_id: String) -> Option<Root<Node>> { let page = get_page(&*page, pipeline); @@ -58,7 +58,10 @@ pub fn jsval_to_webdriver(cx: *mut JSContext, val: HandleValue) -> WebDriverJSRe } } -pub fn handle_execute_script(page: &Rc<Page>, pipeline: PipelineId, eval: String, reply: Sender<WebDriverJSResult>) { +pub fn handle_execute_script(page: &Rc<Page>, + pipeline: PipelineId, + eval: String, + reply: IpcSender<WebDriverJSResult>) { let page = get_page(&*page, pipeline); let window = page.window(); let cx = window.r().get_cx(); @@ -68,8 +71,10 @@ pub fn handle_execute_script(page: &Rc<Page>, pipeline: PipelineId, eval: String reply.send(jsval_to_webdriver(cx, rval.handle())).unwrap(); } -pub fn handle_execute_async_script(page: &Rc<Page>, pipeline: PipelineId, eval: String, - reply: Sender<WebDriverJSResult>) { +pub fn handle_execute_async_script(page: &Rc<Page>, + pipeline: PipelineId, + eval: String, + reply: IpcSender<WebDriverJSResult>) { let page = get_page(&*page, pipeline); let window = page.window(); let cx = window.r().get_cx(); @@ -81,7 +86,7 @@ pub fn handle_execute_async_script(page: &Rc<Page>, pipeline: PipelineId, eval: pub fn handle_get_frame_id(page: &Rc<Page>, pipeline: PipelineId, webdriver_frame_id: WebDriverFrameId, - reply: Sender<Result<Option<(PipelineId, SubpageId)>, ()>>) { + reply: IpcSender<Result<Option<(PipelineId, SubpageId)>, ()>>) { let window = match webdriver_frame_id { WebDriverFrameId::Short(_) => { // This isn't supported yet @@ -109,7 +114,7 @@ pub fn handle_get_frame_id(page: &Rc<Page>, } pub fn handle_find_element_css(page: &Rc<Page>, _pipeline: PipelineId, selector: String, - reply: Sender<Result<Option<String>, ()>>) { + reply: IpcSender<Result<Option<String>, ()>>) { reply.send(match page.document().r().QuerySelector(selector.clone()) { Ok(node) => { let result = node.map(|x| NodeCast::from_ref(x.r()).get_unique_id()); @@ -119,8 +124,10 @@ pub fn handle_find_element_css(page: &Rc<Page>, _pipeline: PipelineId, selector: }).unwrap(); } -pub fn handle_find_elements_css(page: &Rc<Page>, _pipeline: PipelineId, selector: String, - reply: Sender<Result<Vec<String>, ()>>) { +pub fn handle_find_elements_css(page: &Rc<Page>, + _pipeline: PipelineId, + selector: String, + reply: IpcSender<Result<Vec<String>, ()>>) { reply.send(match page.document().r().QuerySelectorAll(selector.clone()) { Ok(ref nodes) => { let mut result = Vec::with_capacity(nodes.r().Length() as usize); @@ -137,16 +144,21 @@ pub fn handle_find_elements_css(page: &Rc<Page>, _pipeline: PipelineId, selector }).unwrap(); } -pub fn handle_get_active_element(page: &Rc<Page>, _pipeline: PipelineId, reply: Sender<Option<String>>) { +pub fn handle_get_active_element(page: &Rc<Page>, + _pipeline: PipelineId, + reply: IpcSender<Option<String>>) { reply.send(page.document().r().GetActiveElement().map( |elem| NodeCast::from_ref(elem.r()).get_unique_id())).unwrap(); } -pub fn handle_get_title(page: &Rc<Page>, _pipeline: PipelineId, reply: Sender<String>) { +pub fn handle_get_title(page: &Rc<Page>, _pipeline: PipelineId, reply: IpcSender<String>) { reply.send(page.document().r().Title()).unwrap(); } -pub fn handle_get_text(page: &Rc<Page>, pipeline: PipelineId, node_id: String, reply: Sender<Result<String, ()>>) { +pub fn handle_get_text(page: &Rc<Page>, + pipeline: PipelineId, + node_id: String, + reply: IpcSender<Result<String, ()>>) { reply.send(match find_node_by_unique_id(&*page, pipeline, node_id) { Some(ref node) => { Ok(node.r().GetTextContent().unwrap_or("".to_owned())) @@ -155,7 +167,10 @@ pub fn handle_get_text(page: &Rc<Page>, pipeline: PipelineId, node_id: String, r }).unwrap(); } -pub fn handle_get_name(page: &Rc<Page>, pipeline: PipelineId, node_id: String, reply: Sender<Result<String, ()>>) { +pub fn handle_get_name(page: &Rc<Page>, + pipeline: PipelineId, + node_id: String, + reply: IpcSender<Result<String, ()>>) { reply.send(match find_node_by_unique_id(&*page, pipeline, node_id) { Some(node) => { let element = ElementCast::to_ref(node.r()).unwrap(); diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml index b9920c099f7..70b6dc2fd6d 100644 --- a/components/script_traits/Cargo.toml +++ b/components/script_traits/Cargo.toml @@ -26,7 +26,7 @@ path = "../devtools_traits" git = "https://github.com/pcwalton/ipc-channel" [dependencies] -url = "0.2.35" +url = "0.2.36" libc = "*" euclid = "0.1" serde = "*" diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 94b8ada8efd..ff8c039ee28 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -24,7 +24,7 @@ dependencies = [ "script_tests 0.0.1", "style_tests 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "util_tests 0.0.1", "webdriver_server 0.0.1", @@ -65,7 +65,7 @@ dependencies = [ "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -178,7 +178,7 @@ dependencies = [ "script_traits 0.0.1", "style 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -190,7 +190,7 @@ dependencies = [ "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -239,12 +239,12 @@ name = "devtools" version = "0.0.1" dependencies = [ "devtools_traits 0.0.1", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -253,11 +253,11 @@ name = "devtools_traits" version = "0.0.1" dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -344,7 +344,7 @@ dependencies = [ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -445,14 +445,14 @@ dependencies = [ "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -539,7 +539,7 @@ dependencies = [ "net 0.0.1", "script_traits 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -603,7 +603,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "hyper" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cookie 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", @@ -614,12 +614,13 @@ dependencies = [ "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "solicit 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -641,7 +642,7 @@ source = "git+https://github.com/pcwalton/ipc-channel#1043d943a4da75ba302cfbe0b5 dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -722,13 +723,13 @@ dependencies = [ "script 0.0.1", "script_traits 0.0.1", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -743,9 +744,9 @@ dependencies = [ "net_traits 0.0.1", "profile_traits 0.0.1", "script_traits 0.0.1", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -831,16 +832,16 @@ dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "png 0.1.0 (git+https://github.com/servo/rust-png)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -852,7 +853,7 @@ dependencies = [ "devtools_traits 0.0.1", "euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "net_traits 0.0.1", "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -861,7 +862,7 @@ dependencies = [ "regex_macros 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -871,10 +872,10 @@ name = "net_tests" version = "0.0.1" dependencies = [ "cookie 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "net 0.0.1", "net_traits 0.0.1", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -883,14 +884,14 @@ name = "net_traits" version = "0.0.1" dependencies = [ "euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "png 0.1.0 (git+https://github.com/servo/rust-png)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1023,17 +1024,19 @@ dependencies = [ [[package]] name = "png" version = "0.1.0" -source = "git+https://github.com/servo/rust-png#653902184ce95d2dc44cd4674c8b273fe6a385a9" +source = "git+https://github.com/servo/rust-png#3c3105672622c76fbb079a96384f78e4ff8b68cf" dependencies = [ "gcc 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "png-sys 1.6.16 (git+https://github.com/servo/rust-png)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "png-sys" version = "1.6.16" -source = "git+https://github.com/servo/rust-png#653902184ce95d2dc44cd4674c8b273fe6a385a9" +source = "git+https://github.com/servo/rust-png#3c3105672622c76fbb079a96384f78e4ff8b68cf" [[package]] name = "profile" @@ -1053,7 +1056,7 @@ name = "profile_traits" version = "0.0.1" dependencies = [ "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1131,7 +1134,7 @@ dependencies = [ "euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", "layout_traits 0.0.1", @@ -1147,6 +1150,7 @@ dependencies = [ "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1154,7 +1158,7 @@ dependencies = [ "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "websocket 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1179,9 +1183,9 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "profile_traits 0.0.1", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1202,7 +1206,7 @@ dependencies = [ [[package]] name = "serde" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1283,7 +1287,7 @@ dependencies = [ "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1319,12 +1323,12 @@ dependencies = [ "plugins 0.0.1", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1338,7 +1342,7 @@ dependencies = [ "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1398,12 +1402,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "url" -version = "0.2.35" +version = "0.2.36" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (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.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1430,10 +1435,10 @@ dependencies = [ "plugins 0.0.1", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1460,7 +1465,7 @@ name = "webdriver" version = "0.2.0" source = "git+https://github.com/jgraham/webdriver-rust.git#caf906e67d818f2db5d4f31b08abb0fee561ec43" dependencies = [ - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1471,11 +1476,12 @@ dependencies = [ name = "webdriver_server" version = "0.0.1" dependencies = [ + "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "png 0.1.0 (git+https://github.com/servo/rust-png)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "webdriver 0.2.0 (git+https://github.com/jgraham/webdriver-rust.git)", @@ -1488,12 +1494,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 43bed7d2c8e..de4ea392ae9 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -38,6 +38,7 @@ harness = false [dependencies.png] git = "https://github.com/servo/rust-png" +features = [ "serde-serialization" ] [features] default = ["glutin_app", "window"] @@ -101,7 +102,7 @@ optional = true [dependencies] env_logger = "*" -url = "0.2.35" +url = "0.2.36" time = "0.1.12" bitflags = "*" libc = "*" diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 3fe248a56c0..c6451389e0d 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -25,7 +25,7 @@ encoding = "0.2" fnv = "1.0" rustc-serialize = "0.3" matches = "0.1" -url = "0.2.35" +url = "0.2.36" bitflags = "*" cssparser = "0.3.2" num = "0.1.24" diff --git a/components/style/lib.rs b/components/style/lib.rs index d4d928642da..ca3aa62cc4c 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -11,6 +11,7 @@ #![feature(plugin)] #![feature(vec_push_all)] +#![plugin(serde_macros)] #![plugin(string_cache_plugin)] #![plugin(serde_macros)] #![plugin(plugins)] diff --git a/components/style/viewport.rs b/components/style/viewport.rs index 100879a1621..6236c3cd048 100644 --- a/components/style/viewport.rs +++ b/components/style/viewport.rs @@ -305,7 +305,7 @@ impl<'a, I> ViewportDescriptorDeclarationCascade for I } } -#[derive(Debug, PartialEq)] +#[derive(Debug, PartialEq, Deserialize, Serialize)] pub struct ViewportConstraints { pub size: TypedSize2D<ViewportPx, f32>, diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml index 8ed33f5bd79..61687af1e95 100644 --- a/components/util/Cargo.toml +++ b/components/util/Cargo.toml @@ -31,7 +31,7 @@ smallvec = "0.1" num_cpus = "0.2.2" cssparser = "0.3.1" num = "0.1.24" -url = "*" +url = "0.2.36" euclid = "0.1" serde = "*" serde_macros = "*" diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml index 0a682258501..68edb4f86e0 100644 --- a/components/webdriver_server/Cargo.toml +++ b/components/webdriver_server/Cargo.toml @@ -18,9 +18,13 @@ git = "https://github.com/jgraham/webdriver-rust.git" [dependencies.png] git = "https://github.com/servo/rust-png" +features = [ "serde-serialization" ] + +[dependencies.ipc-channel] +git = "https://github.com/pcwalton/ipc-channel" [dependencies] log = "*" rustc-serialize = "0.3.4" -url = "0.2.35" +url = "0.2.36" uuid = "*" diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index c13ff457ca1..6713fbfe453 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -17,11 +17,11 @@ extern crate url; extern crate util; extern crate rustc_serialize; extern crate uuid; +extern crate ipc_channel; use msg::constellation_msg::{ConstellationChan, LoadData, FrameId, PipelineId, NavigationDirection, WebDriverCommandMsg}; use msg::constellation_msg::Msg as ConstellationMsg; -use std::sync::mpsc::{channel, Receiver}; use msg::webdriver_msg::{WebDriverFrameId, WebDriverScriptCommand, WebDriverJSError, WebDriverJSResult, LoadStatus}; use url::Url; @@ -35,6 +35,7 @@ use webdriver::server::{self, WebDriverHandler, Session}; use webdriver::error::{WebDriverResult, WebDriverError, ErrorStatus}; use util::task::spawn_named; use uuid::Uuid; +use ipc_channel::ipc::{self, IpcReceiver}; use std::borrow::ToOwned; use rustc_serialize::json::{Json, ToJson}; @@ -133,7 +134,7 @@ impl Handler { } fn get_pipeline(&self, frame_id: Option<FrameId>) -> Option<PipelineId> { - let (sender, reciever) = channel(); + let (sender, reciever) = ipc::channel().unwrap(); let ConstellationChan(ref const_chan) = self.constellation_chan; const_chan.send(ConstellationMsg::GetPipeline(frame_id, sender)).unwrap(); @@ -168,7 +169,7 @@ impl Handler { let pipeline_id = try!(self.get_root_pipeline()); - let (sender, reciever) = channel(); + let (sender, reciever) = ipc::channel().unwrap(); let load_data = LoadData::new(url); let ConstellationChan(ref const_chan) = self.constellation_chan; @@ -205,7 +206,7 @@ impl Handler { fn handle_get_title(&self) -> WebDriverResult<WebDriverResponse> { let pipeline_id = try!(self.get_root_pipeline()); - let (sender, reciever) = channel(); + let (sender, reciever) = ipc::channel().unwrap(); let ConstellationChan(ref const_chan) = self.constellation_chan; let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, WebDriverScriptCommand::GetTitle(sender)); @@ -236,7 +237,7 @@ impl Handler { "Unsupported locator strategy")) } - let (sender, reciever) = channel(); + let (sender, reciever) = ipc::channel().unwrap(); let ConstellationChan(ref const_chan) = self.constellation_chan; let cmd = WebDriverScriptCommand::FindElementCSS(parameters.value.clone(), sender); let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, cmd); @@ -276,7 +277,7 @@ impl Handler { "Selecting frame by id not supported")); } let pipeline_id = try!(self.get_frame_pipeline()); - let (sender, reciever) = channel(); + let (sender, reciever) = ipc::channel().unwrap(); let cmd = WebDriverScriptCommand::GetFrameId(frame_id, sender); { let ConstellationChan(ref const_chan) = self.constellation_chan; @@ -286,7 +287,7 @@ impl Handler { let frame = match reciever.recv().unwrap() { Ok(Some((pipeline_id, subpage_id))) => { - let (sender, reciever) = channel(); + let (sender, reciever) = ipc::channel().unwrap(); let ConstellationChan(ref const_chan) = self.constellation_chan; const_chan.send(ConstellationMsg::GetFrame(pipeline_id, subpage_id, sender)).unwrap(); reciever.recv().unwrap() @@ -311,7 +312,7 @@ impl Handler { "Unsupported locator strategy")) } - let (sender, reciever) = channel(); + let (sender, reciever) = ipc::channel().unwrap(); let ConstellationChan(ref const_chan) = self.constellation_chan; let cmd = WebDriverScriptCommand::FindElementsCSS(parameters.value.clone(), sender); let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, cmd); @@ -330,7 +331,7 @@ impl Handler { fn handle_get_element_text(&self, element: &WebElement) -> WebDriverResult<WebDriverResponse> { let pipeline_id = try!(self.get_frame_pipeline()); - let (sender, reciever) = channel(); + let (sender, reciever) = ipc::channel().unwrap(); let ConstellationChan(ref const_chan) = self.constellation_chan; let cmd = WebDriverScriptCommand::GetElementText(element.id.clone(), sender); let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, cmd); @@ -345,7 +346,7 @@ impl Handler { fn handle_get_active_element(&self) -> WebDriverResult<WebDriverResponse> { let pipeline_id = try!(self.get_frame_pipeline()); - let (sender, reciever) = channel(); + let (sender, reciever) = ipc::channel().unwrap(); let ConstellationChan(ref const_chan) = self.constellation_chan; let cmd = WebDriverScriptCommand::GetActiveElement(sender); let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, cmd); @@ -357,7 +358,7 @@ impl Handler { fn handle_get_element_tag_name(&self, element: &WebElement) -> WebDriverResult<WebDriverResponse> { let pipeline_id = try!(self.get_frame_pipeline()); - let (sender, reciever) = channel(); + let (sender, reciever) = ipc::channel().unwrap(); let ConstellationChan(ref const_chan) = self.constellation_chan; let cmd = WebDriverScriptCommand::GetElementTagName(element.id.clone(), sender); let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, cmd); @@ -382,7 +383,8 @@ impl Handler { Ok(WebDriverResponse::Void) } - fn handle_execute_script(&self, parameters: &JavascriptCommandParameters) -> WebDriverResult<WebDriverResponse> { + fn handle_execute_script(&self, parameters: &JavascriptCommandParameters) + -> WebDriverResult<WebDriverResponse> { let func_body = ¶meters.script; let args_string = ""; @@ -391,7 +393,7 @@ impl Handler { // it with a vec of arguments. let script = format!("(function() {{ {} }})({})", func_body, args_string); - let (sender, reciever) = channel(); + let (sender, reciever) = ipc::channel().unwrap(); let command = WebDriverScriptCommand::ExecuteScript(script, sender); self.execute_script(command, reciever) } @@ -405,14 +407,15 @@ impl Handler { "setTimeout(webdriverTimeout, {}); (function(callback) {{ {} }})({})", self.script_timeout, func_body, args_string); - let (sender, reciever) = channel(); + let (sender, reciever) = ipc::channel().unwrap(); let command = WebDriverScriptCommand::ExecuteAsyncScript(script, sender); self.execute_script(command, reciever) } fn execute_script(&self, command: WebDriverScriptCommand, - reciever: Receiver<WebDriverJSResult>) -> WebDriverResult<WebDriverResponse> { + reciever: IpcReceiver<WebDriverJSResult>) + -> WebDriverResult<WebDriverResponse> { let pipeline_id = try!(self.get_frame_pipeline()); let ConstellationChan(ref const_chan) = self.constellation_chan; @@ -435,7 +438,7 @@ impl Handler { let iterations = 30_000 / interval; for _ in 0..iterations { - let (sender, reciever) = channel(); + let (sender, reciever) = ipc::channel().unwrap(); let ConstellationChan(ref const_chan) = self.constellation_chan; let cmd_msg = WebDriverCommandMsg::TakeScreenshot(pipeline_id, sender); const_chan.send(ConstellationMsg::WebDriverCommand(cmd_msg)).unwrap(); diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index b27e8cc7490..cf7a519b8e4 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ "servo 0.0.1", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "style 0.0.1", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -64,7 +64,7 @@ dependencies = [ "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -177,7 +177,7 @@ dependencies = [ "script_traits 0.0.1", "style 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -189,7 +189,7 @@ dependencies = [ "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -238,12 +238,12 @@ name = "devtools" version = "0.0.1" dependencies = [ "devtools_traits 0.0.1", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -252,11 +252,11 @@ name = "devtools_traits" version = "0.0.1" dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -343,7 +343,7 @@ dependencies = [ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -444,14 +444,14 @@ dependencies = [ "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -531,7 +531,7 @@ dependencies = [ "net 0.0.1", "script_traits 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -595,7 +595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "hyper" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cookie 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", @@ -606,12 +606,13 @@ dependencies = [ "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "solicit 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -633,7 +634,7 @@ source = "git+https://github.com/pcwalton/ipc-channel#1043d943a4da75ba302cfbe0b5 dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -714,13 +715,13 @@ dependencies = [ "script 0.0.1", "script_traits 0.0.1", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -735,9 +736,9 @@ dependencies = [ "net_traits 0.0.1", "profile_traits 0.0.1", "script_traits 0.0.1", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -823,16 +824,16 @@ dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "png 0.1.0 (git+https://github.com/servo/rust-png)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -844,7 +845,7 @@ dependencies = [ "devtools_traits 0.0.1", "euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "net_traits 0.0.1", "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -853,7 +854,7 @@ dependencies = [ "regex_macros 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -863,14 +864,14 @@ name = "net_traits" version = "0.0.1" dependencies = [ "euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "png 0.1.0 (git+https://github.com/servo/rust-png)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1003,11 +1004,13 @@ dependencies = [ [[package]] name = "png" version = "0.1.0" -source = "git+https://github.com/servo/rust-png#653902184ce95d2dc44cd4674c8b273fe6a385a9" +source = "git+https://github.com/servo/rust-png#3c3105672622c76fbb079a96384f78e4ff8b68cf" dependencies = [ "gcc 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "png-sys 1.6.16 (git+https://github.com/servo/rust-png)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1033,7 +1036,7 @@ name = "profile_traits" version = "0.0.1" dependencies = [ "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1111,7 +1114,7 @@ dependencies = [ "euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", "layout_traits 0.0.1", @@ -1127,6 +1130,7 @@ dependencies = [ "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1134,7 +1138,7 @@ dependencies = [ "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "websocket 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1151,9 +1155,9 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "profile_traits 0.0.1", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1174,7 +1178,7 @@ dependencies = [ [[package]] name = "serde" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1219,7 +1223,7 @@ dependencies = [ "profile_traits 0.0.1", "script 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webdriver_server 0.0.1", ] @@ -1281,7 +1285,7 @@ dependencies = [ "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1317,12 +1321,12 @@ dependencies = [ "plugins 0.0.1", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1382,12 +1386,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "url" -version = "0.2.35" +version = "0.2.36" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (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.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1414,10 +1419,10 @@ dependencies = [ "plugins 0.0.1", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1434,7 +1439,7 @@ name = "webdriver" version = "0.2.0" source = "git+https://github.com/jgraham/webdriver-rust.git#caf906e67d818f2db5d4f31b08abb0fee561ec43" dependencies = [ - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1445,11 +1450,12 @@ dependencies = [ name = "webdriver_server" version = "0.0.1" dependencies = [ + "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "png 0.1.0 (git+https://github.com/servo/rust-png)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "webdriver 0.2.0 (git+https://github.com/jgraham/webdriver-rust.git)", @@ -1462,12 +1468,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 7cac84c7df3..fdeb2594a43 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -21,7 +21,7 @@ dependencies = [ "script_traits 0.0.1", "servo 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -51,7 +51,7 @@ dependencies = [ "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -154,7 +154,7 @@ dependencies = [ "script_traits 0.0.1", "style 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -166,7 +166,7 @@ dependencies = [ "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -215,12 +215,12 @@ name = "devtools" version = "0.0.1" dependencies = [ "devtools_traits 0.0.1", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -229,11 +229,11 @@ name = "devtools_traits" version = "0.0.1" dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -330,7 +330,7 @@ dependencies = [ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -423,14 +423,14 @@ dependencies = [ "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -529,7 +529,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "hyper" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cookie 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", @@ -540,12 +540,13 @@ dependencies = [ "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "solicit 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -567,7 +568,7 @@ source = "git+https://github.com/pcwalton/ipc-channel#1043d943a4da75ba302cfbe0b5 dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -648,13 +649,13 @@ dependencies = [ "script 0.0.1", "script_traits 0.0.1", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -669,9 +670,9 @@ dependencies = [ "net_traits 0.0.1", "profile_traits 0.0.1", "script_traits 0.0.1", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -749,16 +750,16 @@ dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "png 0.1.0 (git+https://github.com/servo/rust-png)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -770,7 +771,7 @@ dependencies = [ "devtools_traits 0.0.1", "euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "net_traits 0.0.1", "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -779,7 +780,7 @@ dependencies = [ "regex_macros 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -789,14 +790,14 @@ name = "net_traits" version = "0.0.1" dependencies = [ "euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "png 0.1.0 (git+https://github.com/servo/rust-png)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -911,17 +912,19 @@ dependencies = [ [[package]] name = "png" version = "0.1.0" -source = "git+https://github.com/servo/rust-png#653902184ce95d2dc44cd4674c8b273fe6a385a9" +source = "git+https://github.com/servo/rust-png#3c3105672622c76fbb079a96384f78e4ff8b68cf" dependencies = [ "gcc 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "png-sys 1.6.16 (git+https://github.com/servo/rust-png)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "png-sys" version = "1.6.16" -source = "git+https://github.com/servo/rust-png#653902184ce95d2dc44cd4674c8b273fe6a385a9" +source = "git+https://github.com/servo/rust-png#3c3105672622c76fbb079a96384f78e4ff8b68cf" [[package]] name = "profile" @@ -941,7 +944,7 @@ name = "profile_traits" version = "0.0.1" dependencies = [ "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1019,7 +1022,7 @@ dependencies = [ "euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", "layout_traits 0.0.1", @@ -1035,6 +1038,7 @@ dependencies = [ "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1042,7 +1046,7 @@ dependencies = [ "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "websocket 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1059,9 +1063,9 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "profile_traits 0.0.1", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1082,7 +1086,7 @@ dependencies = [ [[package]] name = "serde" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1126,7 +1130,7 @@ dependencies = [ "profile_traits 0.0.1", "script 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webdriver_server 0.0.1", ] @@ -1179,7 +1183,7 @@ dependencies = [ "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1215,12 +1219,12 @@ dependencies = [ "plugins 0.0.1", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1280,12 +1284,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "url" -version = "0.2.35" +version = "0.2.36" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (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.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1303,10 +1308,10 @@ dependencies = [ "plugins 0.0.1", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1323,7 +1328,7 @@ name = "webdriver" version = "0.2.0" source = "git+https://github.com/jgraham/webdriver-rust.git#caf906e67d818f2db5d4f31b08abb0fee561ec43" dependencies = [ - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1334,11 +1339,12 @@ dependencies = [ name = "webdriver_server" version = "0.0.1" dependencies = [ + "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "png 0.1.0 (git+https://github.com/servo/rust-png)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "webdriver 0.2.0 (git+https://github.com/jgraham/webdriver-rust.git)", @@ -1351,12 +1357,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/tests/wpt/metadata/url/url-constructor.html.ini b/tests/wpt/metadata/url/url-constructor.html.ini index b8ff027163a..084c2509dc1 100644 --- a/tests/wpt/metadata/url/url-constructor.html.ini +++ b/tests/wpt/metadata/url/url-constructor.html.ini @@ -108,9 +108,6 @@ [Parsing: <#> against <test:test?test>] expected: FAIL - [Parsing: <http://`{}:`{}@h/`{}?`{}> against <http://doesnotmatter/>] - expected: FAIL - [Parsing: <i> against <sc:/pa/pa>] expected: FAIL |