aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/document.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-04-27 23:14:25 -0500
committerbors-servo <metajack+bors@gmail.com>2015-04-27 23:14:25 -0500
commitd7987e43c944eb9b156bf3244c08fce4cb570db4 (patch)
tree981a01b544e1c3f2a57fb003ade762093e981aa1 /components/script/dom/document.rs
parent8ecb9d681c385995b082d67874fdfa7f1e929e1f (diff)
parent369a568264f8c9095681f2fee5c6bad03f312cbc (diff)
downloadservo-d7987e43c944eb9b156bf3244c08fce4cb570db4.tar.gz
servo-d7987e43c944eb9b156bf3244c08fce4cb570db4.zip
Auto merge of #5855 - Manishearth:nomove, r=kmc,munksgaard
fixes #5724, #5737 uses https://github.com/Manishearth/rust-tenacious (can be moved in-tree if needed) I can make it `Deny` by default too (I'll add a cargo feature to tenacious), though we might want it on `Warn` until we get some mileage on it. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5855) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/document.rs')
-rw-r--r--components/script/dom/document.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index cbfc214f040..d3a40abf753 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -1195,7 +1195,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
match title {
None => DOMString::new(),
- Some(title) => {
+ Some(ref title) => {
// Steps 3-4.
let value = Node::collect_text_contents(title.r().children());
split_html_space_chars(&value).collect::<Vec<_>>().connect(" ")
@@ -1310,9 +1310,9 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
return Ok(());
}
- match (self.get_html_element().root(), old_body) {
+ match (self.get_html_element().root(), &old_body) {
// Step 3.
- (Some(ref root), Some(ref child)) => {
+ (Some(ref root), &Some(ref child)) => {
let root: JSRef<Node> = NodeCast::from_ref(root.r());
let child: JSRef<Node> = NodeCast::from_ref(child.r());
let new_body: JSRef<Node> = NodeCast::from_ref(new_body);
@@ -1323,7 +1323,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
(None, _) => return Err(HierarchyRequest),
// Step 5.
- (Some(ref root), None) => {
+ (Some(ref root), &None) => {
let root: JSRef<Node> = NodeCast::from_ref(root.r());
let new_body: JSRef<Node> = NodeCast::from_ref(new_body);
assert!(root.AppendChild(new_body).is_ok());