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/user_search.go | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'model/user_search.go') diff --git a/model/user_search.go b/model/user_search.go index 6213b16e4..94596bdcd 100644 --- a/model/user_search.go +++ b/model/user_search.go @@ -20,22 +20,13 @@ type UserSearch struct { // ToJson convert a User to a json string func (u *UserSearch) ToJson() string { - b, err := json.Marshal(u) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(u) + return string(b) } // UserSearchFromJson will decode the input and return a User func UserSearchFromJson(data io.Reader) *UserSearch { - decoder := json.NewDecoder(data) - var us UserSearch - err := decoder.Decode(&us) - if err == nil { - return &us - } else { - return nil - } + var us *UserSearch + json.NewDecoder(data).Decode(&us) + return us } -- cgit v1.2.3-1-g7c22