aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbors-servo <release+servo@mozilla.com>2014-05-05 06:19:21 -0400
committerbors-servo <release+servo@mozilla.com>2014-05-05 06:19:21 -0400
commitedb1547502012c2145ce1411dc923720134bb8f1 (patch)
tree4f58badbe1c39a2d2cdc14e556783192d097ab09 /src
parent310d2a19bbc1b8933f05cbd77c79df155ac00d94 (diff)
parent1008a536a78ffe010ad3d69eefd4cce269c4aa3f (diff)
downloadservo-edb1547502012c2145ce1411dc923720134bb8f1.tar.gz
servo-edb1547502012c2145ce1411dc923720134bb8f1.zip
auto merge of #2323 : Manishearth/servo/warnings, r=Ms2ger
The `.encode()`s from where the unused_result warnings come from seem to wrap an `encode()` and return `Ok(())`. They should probably bubble the result out.
Diffstat (limited to 'src')
-rw-r--r--src/components/script/dom/bindings/trace.rs3
-rw-r--r--src/components/script/dom/domimplementation.rs2
-rw-r--r--src/components/script/layout_interface.rs3
3 files changed, 3 insertions, 5 deletions
diff --git a/src/components/script/dom/bindings/trace.rs b/src/components/script/dom/bindings/trace.rs
index cbbeddb8594..129eafedfe7 100644
--- a/src/components/script/dom/bindings/trace.rs
+++ b/src/components/script/dom/bindings/trace.rs
@@ -138,8 +138,7 @@ impl<T> DerefMut<T> for Traceable<T> {
impl<S: Encoder<E>, E, T: Encodable<S, E>> Encodable<S, E> for Traceable<RefCell<T>> {
fn encode(&self, s: &mut S) -> Result<(), E> {
- self.borrow().encode(s);
- Ok(())
+ self.borrow().encode(s)
}
}
diff --git a/src/components/script/dom/domimplementation.rs b/src/components/script/dom/domimplementation.rs
index 725f5a12481..a21a20f5634 100644
--- a/src/components/script/dom/domimplementation.rs
+++ b/src/components/script/dom/domimplementation.rs
@@ -82,7 +82,7 @@ impl<'a> DOMImplementationMethods for JSRef<'a, DOMImplementation> {
// Step 1.
let mut doc = Document::new(&win.root_ref(), None, NonHTMLDocument, None).root();
// Step 2-3.
- let mut maybe_elem = if qname.is_empty() {
+ let maybe_elem = if qname.is_empty() {
None
} else {
match doc.CreateElementNS(namespace, qname) {
diff --git a/src/components/script/layout_interface.rs b/src/components/script/layout_interface.rs
index 876d37f43af..b971d2ee2dd 100644
--- a/src/components/script/layout_interface.rs
+++ b/src/components/script/layout_interface.rs
@@ -73,8 +73,7 @@ impl<S: Encoder<E>, E> Encodable<S, E> for TrustedNodeAddress {
let node = addr as *Node as *mut Node;
unsafe {
JS::from_raw(node).encode(s)
- };
- Ok(())
+ }
}
}