aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/dom
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/script/dom')
-rw-r--r--src/components/script/dom/bindings/codegen/CodegenRust.py2
-rw-r--r--src/components/script/dom/bindings/node.rs4
-rw-r--r--src/components/script/dom/node.rs4
-rw-r--r--src/components/script/dom/window.rs3
4 files changed, 6 insertions, 7 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index 18e590fc30d..5734df036c6 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -4025,7 +4025,7 @@ def finalizeHook(descriptor, hookName, context):
assert descriptor.nativeIsISupports
release = """let val = JS_GetReservedSlot(obj, dom_object_slot(obj));
let _: @mut %s = cast::transmute(RUST_JSVAL_TO_PRIVATE(val));
-debug!("%s finalize: %%p", this);
+debug!("%s finalize: {:p}", this);
""" % (descriptor.concreteType, descriptor.concreteType)
#return clearWrapper + release
return release
diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs
index e2d10ec6387..09f17770c56 100644
--- a/src/components/script/dom/bindings/node.rs
+++ b/src/components/script/dom/bindings/node.rs
@@ -127,7 +127,7 @@ impl Traceable for Node<ScriptView> {
if node.is_none() {
return;
}
- debug!("tracing %s", name);
+ debug!("tracing {:s}", name);
let node = node.unwrap();
let obj = node.reflector().get_jsobject();
assert!(obj.is_not_null());
@@ -140,7 +140,7 @@ impl Traceable for Node<ScriptView> {
}
}
}
- debug!("tracing %p?:", self.reflector_.get_jsobject());
+ debug!("tracing {:p}?:", self.reflector_.get_jsobject());
trace_node(tracer, self.parent_node, "parent");
trace_node(tracer, self.first_child, "first child");
trace_node(tracer, self.last_child, "last child");
diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs
index 43178101e01..725d69e711f 100644
--- a/src/components/script/dom/node.rs
+++ b/src/components/script/dom/node.rs
@@ -425,7 +425,7 @@ impl<'self, View> AbstractNode<View> {
}
s.push_str(self.debug_str());
- debug!("%s", s);
+ debug!("{:s}", s);
// FIXME: this should have a pure version?
for kid in self.children() {
@@ -435,7 +435,7 @@ impl<'self, View> AbstractNode<View> {
/// Returns a string that describes this node.
pub fn debug_str(&self) -> ~str {
- fmt!("%?", self.type_id())
+ format!("{:?}", self.type_id())
}
pub fn children(&self) -> AbstractNodeChildrenIterator<View> {
diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs
index 8f9994458fb..0a5bb19d3ec 100644
--- a/src/components/script/dom/window.rs
+++ b/src/components/script/dom/window.rs
@@ -23,7 +23,6 @@ use std::cell::Cell;
use std::comm;
use std::comm::SharedChan;
use std::hashmap::HashSet;
-use std::io;
use std::ptr;
use std::int;
use std::libc;
@@ -74,7 +73,7 @@ pub struct TimerData {
impl Window {
pub fn Alert(&self, s: &DOMString) {
// Right now, just print to the console
- io::println(fmt!("ALERT: %s", null_str_as_empty(s)));
+ println(format!("ALERT: {:s}", null_str_as_empty(s)));
}
pub fn Close(&self) {