From 0c6514eac8d143cf925980bbf40d2f70bc35f718 Mon Sep 17 00:00:00 2001
From: Lars Bergstrom <lbergstrom@mozilla.com>
Date: Thu, 12 Sep 2013 15:16:35 -0700
Subject: [PATCH] Remove a stray space. Clean up awkware if result...result
 construct.

---
 Makefile.in                                         | 2 +-
 src/components/main/compositing/compositor_layer.rs | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 5ff62a288a72..906c084bc070 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,7 +43,7 @@ endif
 
 ifdef CFG_ENABLE_DEBUG
   $(info cfg: enabling more debugging (CFG_ENABLE_DEBUG))
-  CFG_RUSTC_FLAGS += 
+  CFG_RUSTC_FLAGS +=
   CFG_GCCISH_CFLAGS += -DRUST_DEBUG
 else
   CFG_GCCISH_CFLAGS += -DRUST_NDEBUG
diff --git a/src/components/main/compositing/compositor_layer.rs b/src/components/main/compositing/compositor_layer.rs
index ed7f116a11e8..f11dd54156b9 100644
--- a/src/components/main/compositing/compositor_layer.rs
+++ b/src/components/main/compositing/compositor_layer.rs
@@ -489,12 +489,9 @@ impl CompositorLayer {
                     .any(|x| {
                                 let buffers = cell.take();
                                 let result = x.add_buffers(pipeline_id, buffers.clone(), epoch);
-                                if result {
-                                    result
-                                } else {
-                                    cell.put_back(buffers);
-                                    result
-                                }})
+                                cell.put_back(buffers);
+                                result
+                                })
         }
     }