Update rustc to revision 3dcd2157403163789aaf21a9ab3c4d30a7c6494d.

1 files changed, 6 insertions, 4 deletions

diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs
index ae7af114d7a..ed90118d1fd 100644
--- a/components/script/dom/worker.rs
+++ b/components/script/dom/worker.rs
@@ -6,15 +6,17 @@ use dom::bindings::codegen::Bindings::WorkerBinding;
 use dom::bindings::codegen::Bindings::WorkerBinding::WorkerMethods;
 use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull;
 use dom::bindings::codegen::InheritTypes::EventTargetCast;
-use dom::bindings::error::{Fallible, Syntax, ErrorResult, DataClone};
+use dom::bindings::error::{Fallible, ErrorResult};
+use dom::bindings::error::Error::{Syntax, DataClone};
 use dom::bindings::global::{GlobalRef, GlobalField};
 use dom::bindings::js::{JS, JSRef, Temporary};
 use dom::bindings::trace::JSTraceable;
 use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
 use dom::dedicatedworkerglobalscope::DedicatedWorkerGlobalScope;
-use dom::eventtarget::{EventTarget, EventTargetHelpers, WorkerTypeId};
+use dom::eventtarget::{EventTarget, EventTargetHelpers, EventTargetTypeId};
 use dom::messageevent::MessageEvent;
-use script_task::{ScriptChan, DOMMessage};
+use script_task::ScriptChan;
+use script_task::ScriptMsg::DOMMessage;
 
 use servo_util::str::DOMString;
 
@@ -44,7 +46,7 @@ pub struct Worker {
 impl Worker {
     fn new_inherited(global: &GlobalRef, sender: ScriptChan) -> Worker {
         Worker {
-            eventtarget: EventTarget::new_inherited(WorkerTypeId),
+            eventtarget: EventTarget::new_inherited(EventTargetTypeId::Worker),
             refcount: Cell::new(0),
             global: GlobalField::from_rooted(global),
             sender: sender,