Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-23 02:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #6446 - Fix some warnings (from Ms2ger:warnings); r=metajack

Browse Source 
Source-Repo: https://github.com/servo/servo
Source-Revision: e4412be1b6c0bd5284b2e177b527a3140053f39c
This commit is contained in:
Ms2ger 2015-06-23 14:09:23 -06:00
parent 5cd9134a2e
commit 28afc94297
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
servo/components/script/dom/browsercontext.rs
View File

@ -29,6 +29,7 @@ use std::default::Default;
#[jstraceable] #[jstraceable]
#[privatize] #[privatize]
#[allow(raw_pointer_derive)]
pub struct BrowserContext { pub struct BrowserContext {
history: Vec<SessionHistoryEntry>, history: Vec<SessionHistoryEntry>,
active_index: usize, active_index: usize,

10
servo/components/script/dom/treewalker.rs
View File

@ -298,14 +298,16 @@ impl<'a> PrivateTreeWalkerHelpers for &'a TreeWalker {
{ {
// "To **traverse children** of type *type*, run these steps:" // "To **traverse children** of type *type*, run these steps:"
// "1. Let node be the value of the currentNode attribute." // "1. Let node be the value of the currentNode attribute."
// "2. Set node to node's first child if type is first, and node's last child if type is last."
let cur = self.current_node.get().root(); let cur = self.current_node.get().root();
// "2. Set node to node's first child if type is first, and node's last child if type is last."
// "3. If node is null, return null."
let mut node = match next_child(cur.r()) { let mut node = match next_child(cur.r()) {
Some(node) => node, Some(node) => node,
None => return Ok(None), None => return Ok(None),
}; };
// 3. Main: While node is not null, run these substeps: // 4. Main: Repeat these substeps:
'main: loop { 'main: loop {
// "1. Filter node and let result be the return value." // "1. Filter node and let result be the return value."
let result = try!(self.accept_node(node.r())); let result = try!(self.accept_node(node.r()));
@ -331,7 +333,7 @@ impl<'a> PrivateTreeWalkerHelpers for &'a TreeWalker {
}, },
_ => {} _ => {}
} }
// "4. While node is not null, run these substeps:" // "4. Repeat these subsubsteps:"
loop { loop {
// "1. Let sibling be node's next sibling if type is next, // "1. Let sibling be node's next sibling if type is next,
// and node's previous sibling if type is previous." // and node's previous sibling if type is previous."
@ -359,8 +361,6 @@ impl<'a> PrivateTreeWalkerHelpers for &'a TreeWalker {
} }
} }
} }
// "4. Return null."
Ok(None)
} }
// https://dom.spec.whatwg.org/#concept-traverse-siblings // https://dom.spec.whatwg.org/#concept-traverse-siblings