Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

script: Fix merge fallout.

Browse source
This commit is contained in:
Patrick Walton 2015-07-30 22:35:12 -07:00
parent 2aa5174246
commit 024c4df912
4 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/net/resource_task.rs
View file

@ -250,7 +250,7 @@ impl ResourceChannelManager {
} }
} }
struct ResourceManager { pub struct ResourceManager {
user_agent: Option<String>, user_agent: Option<String>,
cookie_storage: CookieStorage, cookie_storage: CookieStorage,
resource_task: IpcSender<ControlMsg>, resource_task: IpcSender<ControlMsg>,
@ -260,10 +260,10 @@ struct ResourceManager {
} }
impl ResourceManager { impl ResourceManager {
fn new(user_agent: Option<String>, pub fn new(user_agent: Option<String>,
resource_task: IpcSender<ControlMsg>, resource_task: IpcSender<ControlMsg>,
hsts_list: HSTSList, hsts_list: HSTSList,
devtools_channel: Option<Sender<DevtoolsControlMsg>>) -> ResourceManager { devtools_channel: Option<Sender<DevtoolsControlMsg>>) -> ResourceManager {
ResourceManager { ResourceManager {
user_agent: user_agent, user_agent: user_agent,
cookie_storage: CookieStorage::new(), cookie_storage: CookieStorage::new(),

4
components/net_traits/Cargo.toml
View file

@ -24,10 +24,6 @@ git = "https://github.com/servo/rust-stb-image"
version = "0.6" version = "0.6"
features = [ "serde-serialization" ] features = [ "serde-serialization" ]
[dependencies.url]
version = "0.2.36"
features = [ "serde_serialization" ]
[dependencies.ipc-channel] [dependencies.ipc-channel]
git = "https://github.com/pcwalton/ipc-channel" git = "https://github.com/pcwalton/ipc-channel"

8
components/script/dom/bindings/trace.rs
View file

@ -65,7 +65,6 @@ use net_traits::image::base::Image;
use profile_traits::mem::ProfilerChan; use profile_traits::mem::ProfilerChan;
use util::str::{LengthOrPercentageOrAuto}; use util::str::{LengthOrPercentageOrAuto};
use selectors::parser::PseudoElement; use selectors::parser::PseudoElement;
use serde::{Deserialize, Serialize};
use std::cell::{Cell, UnsafeCell, RefCell}; use std::cell::{Cell, UnsafeCell, RefCell};
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use std::collections::hash_state::HashState; use std::collections::hash_state::HashState;
@ -357,6 +356,13 @@ impl JSTraceable for Box<LayoutRPC+'static> {
} }
} }
impl JSTraceable for () {
#[inline]
fn trace(&self, _: *mut JSTracer) {
// Do nothing
}
}
impl<T> JSTraceable for IpcReceiver<T> where T: Deserialize + Serialize { impl<T> JSTraceable for IpcReceiver<T> where T: Deserialize + Serialize {
#[inline] #[inline]
fn trace(&self, _: *mut JSTracer) { fn trace(&self, _: *mut JSTracer) {

3
tests/unit/net/hsts.rs
View file

@ -7,6 +7,7 @@ use net::hsts::HSTSEntry;
use net_traits::IncludeSubdomains; use net_traits::IncludeSubdomains;
use net::hsts::{secure_url, preload_hsts_domains}; use net::hsts::{secure_url, preload_hsts_domains};
use net::resource_task::ResourceManager; use net::resource_task::ResourceManager;
use ipc_channel::ipc;
use std::sync::mpsc::channel; use std::sync::mpsc::channel;
use url::Url; use url::Url;
use time; use time;
@ -17,7 +18,7 @@ fn test_add_hsts_entry_to_resource_manager_adds_an_hsts_entry() {
entries: Vec::new() entries: Vec::new()
}; };
let (tx, _) = channel(); let (tx, _) = ipc::channel().unwrap();
let mut manager = ResourceManager::new(None, tx, list, None); let mut manager = ResourceManager::new(None, tx, list, None);
let entry = HSTSEntry::new( let entry = HSTSEntry::new(