diff options
Diffstat (limited to 'components/layout')
-rw-r--r-- | components/layout/floats.rs | 4 | ||||
-rw-r--r-- | components/layout/flow.rs | 14 | ||||
-rw-r--r-- | components/layout/flow_list.rs | 4 | ||||
-rw-r--r-- | components/layout/fragment.rs | 8 |
4 files changed, 14 insertions, 16 deletions
diff --git a/components/layout/floats.rs b/components/layout/floats.rs index 43d05e4bad4..1fc28e9750a 100644 --- a/components/layout/floats.rs +++ b/components/layout/floats.rs @@ -78,9 +78,9 @@ impl FloatList { impl fmt::Debug for FloatList { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - try!(write!(f, "max_block_start={:?} floats={}", self.max_block_start, self.floats.len())); + write!(f, "max_block_start={:?} floats={}", self.max_block_start, self.floats.len())?; for float in self.floats.iter() { - try!(write!(f, " {:?}", float)); + write!(f, " {:?}", float)?; } Ok(()) } diff --git a/components/layout/flow.rs b/components/layout/flow.rs index 5930df5dd81..f87fe4c9ef8 100644 --- a/components/layout/flow.rs +++ b/components/layout/flow.rs @@ -1011,14 +1011,12 @@ impl fmt::Debug for BaseFlow { impl Serialize for BaseFlow { fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> { - let mut serializer = try!(serializer.serialize_struct("base", 5)); - try!(serializer.serialize_field("id", &self.debug_id())); - try!(serializer.serialize_field("stacking_relative_position", - &self.stacking_relative_position)); - try!(serializer.serialize_field("intrinsic_inline_sizes", - &self.intrinsic_inline_sizes)); - try!(serializer.serialize_field("position", &self.position)); - try!(serializer.serialize_field("children", &self.children)); + let mut serializer = serializer.serialize_struct("base", 5)?; + serializer.serialize_field("id", &self.debug_id())?; + serializer.serialize_field("stacking_relative_position", &self.stacking_relative_position)?; + serializer.serialize_field("intrinsic_inline_sizes", &self.intrinsic_inline_sizes)?; + serializer.serialize_field("position", &self.position)?; + serializer.serialize_field("children", &self.children)?; serializer.end() } } diff --git a/components/layout/flow_list.rs b/components/layout/flow_list.rs index 60423bad154..97fd6dbc89f 100644 --- a/components/layout/flow_list.rs +++ b/components/layout/flow_list.rs @@ -24,7 +24,7 @@ pub struct FlowList { impl Serialize for FlowList { fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> { - let mut serializer = try!(serializer.serialize_seq(Some(self.len()))); + let mut serializer = serializer.serialize_seq(Some(self.len()))?; for f in self.iter() { let mut flow_val = Map::new(); flow_val.insert("class".to_owned(), to_value(f.class()).unwrap()); @@ -43,7 +43,7 @@ impl Serialize for FlowList { } }; flow_val.insert("data".to_owned(), data); - try!(serializer.serialize_element(&flow_val)); + serializer.serialize_element(&flow_val)?; } serializer.end() } diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 3eb403b98a9..818717343ec 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -143,10 +143,10 @@ pub struct Fragment { impl Serialize for Fragment { fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> { - let mut serializer = try!(serializer.serialize_struct("fragment", 3)); - try!(serializer.serialize_field("id", &self.debug_id)); - try!(serializer.serialize_field("border_box", &self.border_box)); - try!(serializer.serialize_field("margin", &self.margin)); + let mut serializer = serializer.serialize_struct("fragment", 3)?; + serializer.serialize_field("id", &self.debug_id)?; + serializer.serialize_field("border_box", &self.border_box)?; + serializer.serialize_field("margin", &self.margin)?; serializer.end() } } |