diff options
author | Raghav <rmuddur@gmail.com> | 2016-11-04 11:18:22 -0400 |
---|---|---|
committer | Raghav <rmuddur@gmail.com> | 2016-11-04 11:18:22 -0400 |
commit | 26dac9854633ea765430021ef99edb431bdf24b7 (patch) | |
tree | 1287d570c5fd253beb3d3640f5d7f0eea474f009 /components/script/dom/request.rs | |
parent | c24aa563776844e60fbcb1184982957c0122a7ea (diff) | |
parent | dae007fd1634bcf1545e67abaa7746fa95f10e94 (diff) | |
download | servo-26dac9854633ea765430021ef99edb431bdf24b7.tar.gz servo-26dac9854633ea765430021ef99edb431bdf24b7.zip |
Code review comments and upstream merge conflicts
Incorporated code review comments in components/net/http_loader.rs
Resolved merge conflicts in cargo.lock file. Updated ReferrerPolicy in
lib.rs
Diffstat (limited to 'components/script/dom/request.rs')
-rw-r--r-- | components/script/dom/request.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs index 8e598491ac2..e9cee6da938 100644 --- a/components/script/dom/request.rs +++ b/components/script/dom/request.rs @@ -25,7 +25,7 @@ use dom::headers::{Guard, Headers}; use dom::promise::Promise; use dom::xmlhttprequest::Extractable; use hyper::method::Method as HttpMethod; -use msg::constellation_msg::ReferrerPolicy as MsgReferrerPolicy; +use net_traits::ReferrerPolicy as MsgReferrerPolicy; use net_traits::request::{Origin, Window}; use net_traits::request::CacheMode as NetTraitsRequestCache; use net_traits::request::CredentialsMode as NetTraitsRequestCredentials; |