Skip to content

Commit

Permalink
Remove a stray space. Clean up awkware if result...result construct.
Browse files Browse the repository at this point in the history
  • Loading branch information
larsbergstrom committed Sep 12, 2013
1 parent 969a4e3 commit 0c6514e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Makefile.in
Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions src/components/main/compositing/compositor_layer.rs
Expand Up @@ -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
})
}
}

Expand Down

5 comments on commit 0c6514e

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from metajack
at larsbergstrom@0c6514e

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging larsbergstrom/servo/task_failure = 0c6514e into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 49aa4a5

Please sign in to comment.