diff options
author | Anthony Urena <anthgur@users.noreply.github.com> | 2015-10-06 05:43:52 -0400 |
---|---|---|
committer | Anthony Urena <anthgur@users.noreply.github.com> | 2015-10-06 05:43:52 -0400 |
commit | ba86131cd5a7be41ca3adf5805c096d2756c9276 (patch) | |
tree | b6cd23560f1027f8d1b333ba0ab07c22b8005731 /components/script/dom/workerglobalscope.rs | |
parent | 94816bb3b42e50127db56e64086843b14614ca88 (diff) | |
download | servo-ba86131cd5a7be41ca3adf5805c096d2756c9276.tar.gz servo-ba86131cd5a7be41ca3adf5805c096d2756c9276.zip |
Refactor Error enum usage to consistently be qualified
Diffstat (limited to 'components/script/dom/workerglobalscope.rs')
-rw-r--r-- | components/script/dom/workerglobalscope.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs index 881a6ef3c2f..bd01fce1658 100644 --- a/components/script/dom/workerglobalscope.rs +++ b/components/script/dom/workerglobalscope.rs @@ -6,8 +6,7 @@ use devtools_traits::{DevtoolScriptControlMsg, ScriptToDevtoolsControlMsg}; use dom::bindings::codegen::Bindings::FunctionBinding::Function; use dom::bindings::codegen::Bindings::WorkerGlobalScopeBinding::WorkerGlobalScopeMethods; use dom::bindings::codegen::InheritTypes::DedicatedWorkerGlobalScopeCast; -use dom::bindings::error::Error::{JSFailed, Network, Syntax}; -use dom::bindings::error::{ErrorResult, Fallible, report_pending_exception}; +use dom::bindings::error::{Error, ErrorResult, Fallible, report_pending_exception}; use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, MutNullableHeap, Root}; use dom::bindings::utils::Reflectable; @@ -177,13 +176,13 @@ impl WorkerGlobalScopeMethods for WorkerGlobalScope { .parse(&url); match url { Ok(url) => urls.push(url), - Err(_) => return Err(Syntax), + Err(_) => return Err(Error::Syntax), }; } for url in urls { let (url, source) = match load_whole_resource(&self.resource_task, url) { - Err(_) => return Err(Network), + Err(_) => return Err(Error::Network), Ok((metadata, bytes)) => { (metadata.final_url, String::from_utf8(bytes).unwrap()) } @@ -194,7 +193,7 @@ impl WorkerGlobalScopeMethods for WorkerGlobalScope { Ok(_) => (), Err(_) => { println!("evaluate_script failed"); - return Err(JSFailed); + return Err(Error::JSFailed); } } } |