Skip to content
Permalink
Browse files

Remove a stray space. Clean up awkware if result...result construct.

  • Loading branch information...
larsbergstrom committed Sep 12, 2013
1 parent 969a4e3 commit 0c6514eac8d143cf925980bbf40d2f70bc35f718
Showing with 4 additions and 7 deletions.
  1. +1 −1 Makefile.in
  2. +3 −6 src/components/main/compositing/compositor_layer.rs
@@ -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
@@ -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
})
}
}

5 comments on commit 0c6514e

@bors-servo

This comment has been minimized.

Copy link
Contributor

replied Sep 12, 2013

saw approval from metajack
at larsbergstrom@0c6514e

@bors-servo

This comment has been minimized.

Copy link
Contributor

replied Sep 12, 2013

merging larsbergstrom/servo/task_failure = 0c6514e into auto

@bors-servo

This comment has been minimized.

Copy link
Contributor

replied Sep 12, 2013

larsbergstrom/servo/task_failure = 0c6514e merged ok, testing candidate = 49aa4a5

@bors-servo

This comment has been minimized.

Copy link
Contributor

replied Sep 12, 2013

fast-forwarding master to auto = 49aa4a5

Please sign in to comment.
You can’t perform that action at this time.