Replace try macro with question mark.
This commit is contained in:
parent
4cab10b2d5
commit
edefffe220
@ -194,7 +194,7 @@ impl Serialize for Event {
|
|||||||
|
|
||||||
impl<'de> Deserialize<'de> for Event {
|
impl<'de> Deserialize<'de> for Event {
|
||||||
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
|
||||||
let value: Value = try!(Deserialize::deserialize(deserializer));
|
let value: Value = Deserialize::deserialize(deserializer)?;
|
||||||
|
|
||||||
let event_type_value = match value.get("type") {
|
let event_type_value = match value.get("type") {
|
||||||
Some(value) => value.clone(),
|
Some(value) => value.clone(),
|
||||||
@ -441,7 +441,7 @@ impl Serialize for RoomEvent {
|
|||||||
|
|
||||||
impl<'de> Deserialize<'de> for RoomEvent {
|
impl<'de> Deserialize<'de> for RoomEvent {
|
||||||
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
|
||||||
let value: Value = try!(Deserialize::deserialize(deserializer));
|
let value: Value = Deserialize::deserialize(deserializer)?;
|
||||||
|
|
||||||
let event_type_value = match value.get("type") {
|
let event_type_value = match value.get("type") {
|
||||||
Some(value) => value.clone(),
|
Some(value) => value.clone(),
|
||||||
@ -644,7 +644,7 @@ impl Serialize for StateEvent {
|
|||||||
|
|
||||||
impl<'de> Deserialize<'de> for StateEvent {
|
impl<'de> Deserialize<'de> for StateEvent {
|
||||||
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
|
||||||
let value: Value = try!(Deserialize::deserialize(deserializer));
|
let value: Value = Deserialize::deserialize(deserializer)?;
|
||||||
|
|
||||||
let event_type_value = match value.get("type") {
|
let event_type_value = match value.get("type") {
|
||||||
Some(value) => value.clone(),
|
Some(value) => value.clone(),
|
||||||
|
@ -67,7 +67,7 @@ impl Serialize for Event {
|
|||||||
|
|
||||||
impl<'de> Deserialize<'de> for Event {
|
impl<'de> Deserialize<'de> for Event {
|
||||||
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
|
||||||
let value: Value = try!(Deserialize::deserialize(deserializer));
|
let value: Value = Deserialize::deserialize(deserializer)?;
|
||||||
|
|
||||||
let event_type_value = match value.get("type") {
|
let event_type_value = match value.get("type") {
|
||||||
Some(value) => value.clone(),
|
Some(value) => value.clone(),
|
||||||
@ -148,7 +148,7 @@ impl Serialize for RoomEvent {
|
|||||||
|
|
||||||
impl<'de> Deserialize<'de> for RoomEvent {
|
impl<'de> Deserialize<'de> for RoomEvent {
|
||||||
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
|
||||||
let value: Value = try!(Deserialize::deserialize(deserializer));
|
let value: Value = Deserialize::deserialize(deserializer)?;
|
||||||
|
|
||||||
let event_type_value = match value.get("type") {
|
let event_type_value = match value.get("type") {
|
||||||
Some(value) => value.clone(),
|
Some(value) => value.clone(),
|
||||||
|
@ -270,7 +270,7 @@ impl Serialize for MessageEventContent {
|
|||||||
|
|
||||||
impl<'de> Deserialize<'de> for MessageEventContent {
|
impl<'de> Deserialize<'de> for MessageEventContent {
|
||||||
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
|
||||||
let value: Value = try!(Deserialize::deserialize(deserializer));
|
let value: Value = Deserialize::deserialize(deserializer)?;
|
||||||
|
|
||||||
let message_type_value = match value.get("msgtype") {
|
let message_type_value = match value.get("msgtype") {
|
||||||
Some(value) => value.clone(),
|
Some(value) => value.clone(),
|
||||||
|
@ -97,7 +97,7 @@ impl Serialize for StrippedState {
|
|||||||
|
|
||||||
impl<'de> Deserialize<'de> for StrippedState {
|
impl<'de> Deserialize<'de> for StrippedState {
|
||||||
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
|
||||||
let value: Value = try!(Deserialize::deserialize(deserializer));
|
let value: Value = Deserialize::deserialize(deserializer)?;
|
||||||
|
|
||||||
let event_type_value = match value.get("type") {
|
let event_type_value = match value.get("type") {
|
||||||
Some(value) => value.clone(),
|
Some(value) => value.clone(),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user