modified the code, following the suggestions from reviewer

This commit is contained in:
askeing 2016-04-28 15:06:01 +08:00
parent 71829c787d
commit d6863e6800

View file

@ -276,10 +276,9 @@ impl PreInvoke for StylesheetContext {}
impl AsyncResponseListener for StylesheetContext { impl AsyncResponseListener for StylesheetContext {
fn headers_available(&mut self, metadata: Result<Metadata, NetworkError>) { fn headers_available(&mut self, metadata: Result<Metadata, NetworkError>) {
self.metadata = metadata.ok(); self.metadata = metadata.ok();
let content_type = self.metadata.clone().and_then(|meta| meta.content_type); if let Some(ref meta) = self.metadata {
match content_type { if let Some(ContentType(Mime(TopLevel::Text, SubLevel::Css, _))) = meta.content_type {
Some(ContentType(Mime(TopLevel::Text, SubLevel::Css, _))) => {}, } else {
_ => {
self.elem.root().upcast::<EventTarget>().fire_simple_event("error"); self.elem.root().upcast::<EventTarget>().fire_simple_event("error");
} }
} }
@ -290,14 +289,11 @@ impl AsyncResponseListener for StylesheetContext {
self.data.append(&mut payload); self.data.append(&mut payload);
} }
fn response_complete(&mut self, _status: Result<(), NetworkError>) { fn response_complete(&mut self, status: Result<(), NetworkError>) {
match _status { if status.is_err() {
Err(_) => { self.elem.root().upcast::<EventTarget>().fire_simple_event("error");
self.elem.root().upcast::<EventTarget>().fire_simple_event("error"); return;
return; }
},
_ => {}
};
let data = mem::replace(&mut self.data, vec!()); let data = mem::replace(&mut self.data, vec!());
let metadata = match self.metadata.take() { let metadata = match self.metadata.take() {
Some(meta) => meta, Some(meta) => meta,