aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/parse/html.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-01-03 14:39:46 -0700
committerbors-servo <metajack+bors@gmail.com>2015-01-03 14:39:46 -0700
commite8fac3681b690adb0796b2a807ac95bd9c13597a (patch)
treeb8ad816b28494d51229edb93f4459d092ac9d92d /components/script/parse/html.rs
parentd8b6cec722e67f1fd39f154f4f0a298f2227501f (diff)
parentd5c64f7f30054996e4db70d59cc6fb34e0be987d (diff)
downloadservo-e8fac3681b690adb0796b2a807ac95bd9c13597a.tar.gz
servo-e8fac3681b690adb0796b2a807ac95bd9c13597a.zip
auto merge of #4535 : servo/servo/pre-rustup_20141221, r=jdm
This prepares for the rust upgrade currently being conducted.
Diffstat (limited to 'components/script/parse/html.rs')
-rw-r--r--components/script/parse/html.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs
index eb97d0893a4..a650895e4c3 100644
--- a/components/script/parse/html.rs
+++ b/components/script/parse/html.rs
@@ -111,7 +111,7 @@ impl<'a> TreeSink<TrustedNodeAddress> for servohtmlparser::Sink {
}
fn parse_error(&mut self, msg: MaybeOwned<'static>) {
- debug!("Parse error: {:s}", msg);
+ debug!("Parse error: {}", msg);
}
fn set_quirks_mode(&mut self, mode: QuirksMode) {
@@ -180,7 +180,7 @@ pub fn parse_html(document: JSRef<Document>,
HTMLInput::InputUrl(load_response) => {
match load_response.metadata.content_type {
Some((ref t, _)) if t.as_slice().eq_ignore_ascii_case("image") => {
- let page = format!("<html><body><img src='{:s}' /></body></html>", url.serialize());
+ let page = format!("<html><body><img src='{}' /></body></html>", url.serialize());
parser.parse_chunk(page);
},
_ => {
@@ -192,7 +192,7 @@ pub fn parse_html(document: JSRef<Document>,
parser.parse_chunk(data);
}
Done(Err(err)) => {
- panic!("Failed to load page URL {:s}, error: {:s}", url.serialize(), err);
+ panic!("Failed to load page URL {}, error: {}", url.serialize(), err);
}
Done(Ok(())) => break,
}