From 0c8968fb8df4ce302c928118cd81e75f5bef2861 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 30 Jan 2018 17:23:00 -0600 Subject: unnamed return (#8170) --- model/channel_view.go | 38 ++++++++++---------------------------- 1 file changed, 10 insertions(+), 28 deletions(-) (limited to 'model/channel_view.go') diff --git a/model/channel_view.go b/model/channel_view.go index e7b1de306..650d14ce3 100644 --- a/model/channel_view.go +++ b/model/channel_view.go @@ -14,23 +14,14 @@ type ChannelView struct { } func (o *ChannelView) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func ChannelViewFromJson(data io.Reader) *ChannelView { - decoder := json.NewDecoder(data) - var o ChannelView - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *ChannelView + json.NewDecoder(data).Decode(&o) + return o } type ChannelViewResponse struct { @@ -39,21 +30,12 @@ type ChannelViewResponse struct { } func (o *ChannelViewResponse) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func ChannelViewResponseFromJson(data io.Reader) *ChannelViewResponse { - decoder := json.NewDecoder(data) - var o ChannelViewResponse - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *ChannelViewResponse + json.NewDecoder(data).Decode(&o) + return o } -- cgit v1.2.3-1-g7c22