From 1dc67f0c761debabdadbf81d195a6954812c0d1f Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Mon, 17 Nov 2014 17:59:44 -0800 Subject: [PATCH] convert msg crate to use hyper --- components/msg/Cargo.toml | 4 ++-- components/msg/constellation_msg.rs | 8 ++++---- components/msg/lib.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index 9f77add758ea..c951e5cc5d92 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -17,8 +17,8 @@ git = "https://github.com/servo/rust-azure" [dependencies.geom] git = "https://github.com/servo/rust-geom" -[dependencies.http] -git = "https://github.com/servo/rust-http" +[dependencies.hyper] +git = "https://github.com/hyperium/hyper" branch = "servo" [dependencies.layers] diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs index 7d6dee33fe76..7734501abc29 100644 --- a/components/msg/constellation_msg.rs +++ b/components/msg/constellation_msg.rs @@ -8,8 +8,8 @@ use geom::rect::Rect; use geom::size::TypedSize2D; use geom::scale_factor::ScaleFactor; -use http::headers::request::HeaderCollection as RequestHeaderCollection; -use http::method::{Method, Get}; +use hyper::header::Headers; +use hyper::method::{Method, Get}; use layers::geometry::DevicePixel; use servo_util::geometry::{PagePx, ViewportPx}; use std::comm::{channel, Sender, Receiver}; @@ -214,7 +214,7 @@ pub enum Msg { pub struct LoadData { pub url: Url, pub method: Method, - pub headers: RequestHeaderCollection, + pub headers: Headers, pub data: Option>, } @@ -223,7 +223,7 @@ impl LoadData { LoadData { url: url, method: Get, - headers: RequestHeaderCollection::new(), + headers: Headers::new(), data: None, } } diff --git a/components/msg/lib.rs b/components/msg/lib.rs index de89e367e4a8..d3a829b0f4a9 100644 --- a/components/msg/lib.rs +++ b/components/msg/lib.rs @@ -7,7 +7,7 @@ extern crate azure; extern crate geom; -extern crate http; +extern crate hyper; extern crate layers; extern crate serialize; extern crate "util" as servo_util;