aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/node.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-09-18 22:57:59 -0500
committerGitHub <noreply@github.com>2016-09-18 22:57:59 -0500
commit5457b80233f9ce6773711c7189230d9a0a63d93a (patch)
tree035cee7e21bb31b434d6353241960c12b465e366 /components/script/dom/node.rs
parent157e3cc4e95e89e8c73a601028c09edaefe0f074 (diff)
parent5f961f9fd9aeb13ff6c5746a8d143a30a90b06c2 (diff)
downloadservo-5457b80233f9ce6773711c7189230d9a0a63d93a.tar.gz
servo-5457b80233f9ce6773711c7189230d9a0a63d93a.zip
Auto merge of #13307 - bubbles231:code_refactor, r=Manishearth
Code refactoring <!-- Please describe your changes on the following line: --> The code was refactored to follow Rust naming conventions better. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes help fix #12379. <!-- Either: --> - [ ] There are tests for these changes OR - [X] These changes do not require tests because logic was not changed. <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13307) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/node.rs')
-rw-r--r--components/script/dom/node.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 5f1bee3a730..041d6407418 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -796,10 +796,10 @@ impl Node {
}
pub fn summarize(&self) -> NodeInfo {
- let USVString(baseURI) = self.BaseURI();
+ let USVString(base_uri) = self.BaseURI();
NodeInfo {
uniqueId: self.unique_id(),
- baseURI: baseURI,
+ baseURI: base_uri,
parent: self.GetParentNode().map_or("".to_owned(), |node| node.unique_id()),
nodeType: self.NodeType(),
namespaceURI: String::new(), //FIXME
@@ -2296,8 +2296,8 @@ impl NodeMethods for Node {
}
// https://dom.spec.whatwg.org/#dom-node-issamenode
- fn IsSameNode(&self, otherNode: Option<&Node>) -> bool {
- match otherNode {
+ fn IsSameNode(&self, other_node: Option<&Node>) -> bool {
+ match other_node {
Some(node) => self == node,
None => false,
}