From cfd153cc64c3212e3a19e78837f3a45884975641 Mon Sep 17 00:00:00 2001
From: Emilio Cobos Álvarez <emilio@crisal.io>
Date: Sun, 4 Mar 2018 14:43:13 +0100
Subject: Untry.

Use the ? operator instead of try, and add some more uses of it on Option<> that
were straight-forward.
---
 src/codegen/struct_layout.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/codegen/struct_layout.rs')

diff --git a/src/codegen/struct_layout.rs b/src/codegen/struct_layout.rs
index 32b48965..a538c35f 100644
--- a/src/codegen/struct_layout.rs
+++ b/src/codegen/struct_layout.rs
@@ -155,10 +155,7 @@ impl<'a> StructLayoutTracker<'a> {
         field_ty: &Type,
         field_offset: Option<usize>,
     ) -> Option<quote::Tokens> {
-        let mut field_layout = match field_ty.layout(self.ctx) {
-            Some(l) => l,
-            None => return None,
-        };
+        let mut field_layout = field_ty.layout(self.ctx)?;
 
         if let TypeKind::Array(inner, len) =
             *field_ty.canonical_type(self.ctx).kind()
-- 
cgit v1.2.3