Qualify resource_task enums.

3 files changed, 9 insertions, 7 deletions

diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index 4004a05a58a..2dc5b91b691 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -42,7 +42,9 @@ use js::jsapi::{JS_ParseJSON, JSContext};
 use js::jsapi::JS_ClearPendingException;
 use js::jsval::{JSVal, NullValue, UndefinedValue};
 
-use net::resource_task::{ResourceTask, ResourceCORSData, Load, LoadData, LoadResponse, Payload, Done};
+use net::resource_task::{ResourceTask, ResourceCORSData, LoadData, LoadResponse};
+use net::resource_task::ControlMsg::Load;
+use net::resource_task::ProgressMsg::{Payload, Done};
 use cors::{allow_cross_origin_request, CORSRequest, RequestMode};
 use servo_util::str::DOMString;
 use servo_util::task::spawn_named;
diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs
index a650895e4c3..d8aba1090b0 100644
--- a/components/script/parse/html.rs
+++ b/components/script/parse/html.rs
@@ -21,7 +21,7 @@ use parse::Parser;
 use encoding::all::UTF_8;
 use encoding::types::{Encoding, DecoderTrap};
 
-use servo_net::resource_task::{Payload, Done, LoadResponse};
+use servo_net::resource_task::{ProgressMsg, LoadResponse};
 use servo_util::task_state;
 use servo_util::task_state::IN_HTML_PARSER;
 use std::ascii::AsciiExt;
@@ -186,15 +186,15 @@ pub fn parse_html(document: JSRef<Document>,
                 _ => {
                     for msg in load_response.progress_port.iter() {
                         match msg {
-                            Payload(data) => {
+                            ProgressMsg::Payload(data) => {
                                 // FIXME: use Vec<u8> (html5ever #34)
                                 let data = UTF_8.decode(data.as_slice(), DecoderTrap::Replace).unwrap();
                                 parser.parse_chunk(data);
                             }
-                            Done(Err(err)) => {
+                            ProgressMsg::Done(Err(err)) => {
                                 panic!("Failed to load page URL {}, error: {}", url.serialize(), err);
                             }
-                            Done(Ok(())) => break,
+                            ProgressMsg::Done(Ok(())) => break,
                         }
                     }
                 }
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 990c8476f6a..c3fcb02c893 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -52,7 +52,7 @@ use servo_msg::constellation_msg::{KeyModifiers, SUPER, SHIFT, CONTROL, ALT};
 use servo_msg::constellation_msg::{PipelineExitType};
 use servo_msg::constellation_msg::Msg as ConstellationMsg;
 use servo_net::image_cache_task::ImageCacheTask;
-use servo_net::resource_task::{ResourceTask, Load};
+use servo_net::resource_task::{ResourceTask, ControlMsg};
 use servo_net::resource_task::LoadData as NetLoadData;
 use servo_net::storage_task::StorageTask;
 use servo_util::geometry::to_frac_px;
@@ -810,7 +810,7 @@ impl ScriptTask {
         let (parser_input, final_url) = if !is_javascript {
             // Wait for the LoadResponse so that the parser knows the final URL.
             let (input_chan, input_port) = channel();
-            self.resource_task.send(Load(NetLoadData {
+            self.resource_task.send(ControlMsg::Load(NetLoadData {
                 url: url,
                 method: load_data.method,
                 headers: load_data.headers,