auto merge of #4542 : servo/servo/pre-rustup_20141221, r=saneyuki

In particular, this contains changes to qualify enums where rust will require it, and to stop using some features that will be removed.

1 files changed, 4 insertions, 4 deletions

diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index 0069e2e51e0..ab50117b776 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -22,9 +22,9 @@ use dom::virtualmethods::VirtualMethods;
 use dom::window::Window;
 use page::IterablePage;
 
-use servo_msg::constellation_msg::{PipelineId, SubpageId};
-use servo_msg::constellation_msg::{IFrameSandboxed, IFrameUnsandboxed};
-use servo_msg::constellation_msg::{ConstellationChan, ScriptLoadedURLInIFrameMsg};
+use servo_msg::constellation_msg::{PipelineId, SubpageId, ConstellationChan};
+use servo_msg::constellation_msg::IFrameSandboxState::{IFrameSandboxed, IFrameUnsandboxed};
+use servo_msg::constellation_msg::Msg as ConstellationMsg;
 use servo_util::str::DOMString;
 
 use std::ascii::AsciiExt;
@@ -123,7 +123,7 @@ impl<'a> HTMLIFrameElementHelpers for JSRef<'a, HTMLIFrameElement> {
         }));
 
         let ConstellationChan(ref chan) = page.constellation_chan;
-        chan.send(ScriptLoadedURLInIFrameMsg(url, page.id, subpage_id, sandboxed));
+        chan.send(ConstellationMsg::ScriptLoadedURLInIFrame(url, page.id, subpage_id, sandboxed));
     }
 }