Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upRemove panic! from the compositor #10902
Merged
Conversation
etc/ci/check_no_unwrap.sh
Outdated
| @@ -12,4 +12,4 @@ FILES=("components/compositing/compositor.rs" | |||
| "components/compositing/pipeline.rs" | |||
| "components/compositing/constellation.rs") | |||
|
|
|||
| ! grep -n "unwrap(" "${FILES[@]}" | |||
| ! grep -n "unwrap(\|panic!" "${FILES[@]}" | |||
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
components/compositing/compositor.rs
Outdated
| @@ -1119,7 +1125,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { | |||
| layer_id: LayerId) { | |||
| if let Some(point) = self.fragment_point.take() { | |||
| if !self.move_layer(pipeline_id, layer_id, Point2D::from_untyped(&point)) { | |||
| panic!("Compositor: Tried to scroll to fragment with unknown layer."); | |||
| warn!("Compositor: Tried to scroll to fragment with unknown layer."); | |||
| } | |||
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
r=me after squash Once the buildbot config is part of this repo, I'd like to rename the check_no_unwrap.sh to check_no_panic.sh; I'll probably open that as an E-easy issue. |
asajeffrey
force-pushed the
asajeffrey:remove-explicit-panic-from-compositor
branch
from
3ff89a6
to
5db9287
|
@bors-servo r=aneeshusa |
|
|
bors-servo
added a commit
that referenced
this pull request
Apr 30, 2016
…or, r=aneeshusa Remove panic! from the compositor Fixes #10864, and adds a check to `/etc/ci/check_no_unwrap.sh`. r? @aneeshusa <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10902) <!-- Reviewable:end -->
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
asajeffrey commentedApr 28, 2016
•
edited by larsbergstrom
Fixes #10864, and adds a check to
/etc/ci/check_no_unwrap.sh.r? @aneeshusa
This change is