aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/fragment.rs
diff options
context:
space:
mode:
authorMatt Brubeck <mbrubeck@limpet.net>2017-10-20 08:25:35 -0700
committerMatt Brubeck <mbrubeck@limpet.net>2017-10-20 08:25:35 -0700
commit2d45e9d2da571e70deef137f9022de87cc1126f3 (patch)
treed4f91108a958e80e06110c9437fea132785e8d85 /components/layout/fragment.rs
parentfe16c1d5c3c9084da0ccb85af599d6ec0f8ab20b (diff)
downloadservo-2d45e9d2da571e70deef137f9022de87cc1126f3.tar.gz
servo-2d45e9d2da571e70deef137f9022de87cc1126f3.zip
Use try syntax for Option where appropriate
Diffstat (limited to 'components/layout/fragment.rs')
-rw-r--r--components/layout/fragment.rs10
1 files changed, 2 insertions, 8 deletions
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
index 6e8cb41f9cd..e8455bff4b9 100644
--- a/components/layout/fragment.rs
+++ b/components/layout/fragment.rs
@@ -2895,10 +2895,7 @@ impl Fragment {
/// Returns the 4D matrix representing this fragment's transform.
pub fn transform_matrix(&self, stacking_relative_border_box: &Rect<Au>) -> Option<Transform3D<f32>> {
let list = &self.style.get_box().transform;
- let transform = match list.to_transform_3d_matrix(Some(stacking_relative_border_box)) {
- Some(transform) => transform,
- None => return None,
- };
+ let transform = list.to_transform_3d_matrix(Some(stacking_relative_border_box))?;
let transform_origin = &self.style.get_box().transform_origin;
let transform_origin_x =
@@ -3039,10 +3036,7 @@ impl<'a> Iterator for InlineStyleIterator<'a> {
self.primary_style_yielded = true;
return Some(&*self.fragment.style)
}
- let inline_context = match self.fragment.inline_context {
- None => return None,
- Some(ref inline_context) => inline_context,
- };
+ let inline_context = self.fragment.inline_context.as_ref()?;
let inline_style_index = self.inline_style_index;
if inline_style_index == inline_context.nodes.len() {
return None