Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rust upgrade to rustc hash b03a2755193cd756583bcf5831cf4545d75ecb8a

Browse source
This commit is contained in:
Jack Moffitt 2014-11-05 12:33:11 -07:00 • committed by Glenn Watson
parent 26045d7fcb
commit d1b433a3b3
160 changed files with 1427 additions and 1162 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/script/parse/html.rs
View file

@ -25,8 +25,8 @@ use encoding::types::{Encoding, DecodeReplace};
use servo_net::resource_task::{Load, LoadData, Payload, Done, ResourceTask};
use servo_msg::constellation_msg::LoadData as MsgLoadData;
use servo_util::task_state;
use servo_util::task_state::InHTMLParser;
use std::ascii::StrAsciiExt;
use servo_util::task_state::IN_HTML_PARSER;
use std::ascii::AsciiExt;
use std::comm::channel;
use std::str::MaybeOwned;
use url::Url;
@ -48,19 +48,19 @@ fn parse_last_modified(timestamp: &str) -> String {
// RFC 822, updated by RFC 1123
match time::strptime(timestamp, "%a, %d %b %Y %T %Z") {
Ok(t) => return t.to_local().strftime(format),
Ok(t) => return t.to_local().strftime(format).unwrap(),
Err(_) => ()
}
// RFC 850, obsoleted by RFC 1036
match time::strptime(timestamp, "%A, %d-%b-%y %T %Z") {
Ok(t) => return t.to_local().strftime(format),
Ok(t) => return t.to_local().strftime(format).unwrap(),
Err(_) => ()
}
// ANSI C's asctime() format
match time::strptime(timestamp, "%c") {
Ok(t) => t.to_local().strftime(format),
Ok(t) => t.to_local().strftime(format).unwrap(),
Err(_) => String::from_str("")
}
}
@ -210,8 +210,6 @@ pub fn parse_html(page: &Page,
let load_response = input_port.recv();
debug!("Fetched page; metadata is {:?}", load_response.metadata);
load_response.metadata.headers.as_ref().map(|headers| {
let header = headers.iter().find(|h|
h.header_name().as_slice().to_ascii_lower() == "last-modified".to_string()
@ -246,7 +244,7 @@ pub fn parse_html(page: &Page,
let parser = ServoHTMLParser::new(base_url.clone(), document).root();
let parser: JSRef<ServoHTMLParser> = *parser;
task_state::enter(InHTMLParser);
task_state::enter(IN_HTML_PARSER);
match input {
InputString(s) => {
@ -268,7 +266,7 @@ pub fn parse_html(page: &Page,
parser.parse_chunk(data);
}
Done(Err(err)) => {
fail!("Failed to load page URL {:s}, error: {:s}", url.serialize(), err);
panic!("Failed to load page URL {:s}, error: {:s}", url.serialize(), err);
}
Done(Ok(())) => break,
}
@ -280,7 +278,7 @@ pub fn parse_html(page: &Page,
parser.finish();
task_state::exit(InHTMLParser);
task_state::exit(IN_HTML_PARSER);
debug!("finished parsing");
}