Auto merge of #7053 - connorimes:move-net-error-list, r=mbrubeck

Move net_error_list from net to net_traits. Fixes #7050.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7053)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-07 01:55:20 -06:00
commit 44c4bb00c1
19 changed files with 15 additions and 27 deletions

View file

@ -22,9 +22,6 @@ path = "../script_traits"
[dependencies.msg]
path = "../msg"
[dependencies.net]
path = "../net"
[dependencies.profile_traits]
path = "../profile_traits"

View file

@ -23,7 +23,6 @@ extern crate offscreen_gl_context;
extern crate png;
extern crate script_traits;
extern crate msg;
extern crate net;
extern crate num;
#[macro_use]
extern crate profile_traits;

View file

@ -12,7 +12,7 @@ use euclid::size::TypedSize2D;
use layers::geometry::DevicePixel;
use layers::platform::surface::NativeDisplay;
use msg::constellation_msg::{Key, KeyState, KeyModifiers};
use net::net_error_list::NetError;
use net_traits::net_error_list::NetError;
use script_traits::MouseButton;
use url::Url;
use util::cursor::Cursor;