From 0c8968fb8df4ce302c928118cd81e75f5bef2861 Mon Sep 17 00:00:00 2001
From: Chris <ccbrown112@gmail.com>
Date: Tue, 30 Jan 2018 17:23:00 -0600
Subject: unnamed return (#8170)

---
 model/team_member.go | 56 +++++++++++++---------------------------------------
 1 file changed, 14 insertions(+), 42 deletions(-)

(limited to 'model/team_member.go')

diff --git a/model/team_member.go b/model/team_member.go
index 6c70b75eb..2fcd1e151 100644
--- a/model/team_member.go
+++ b/model/team_member.go
@@ -24,43 +24,25 @@ type TeamUnread struct {
 }
 
 func (o *TeamMember) ToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return ""
-	} else {
-		return string(b)
-	}
+	b, _ := json.Marshal(o)
+	return string(b)
 }
 
 func (o *TeamUnread) ToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return ""
-	} else {
-		return string(b)
-	}
+	b, _ := json.Marshal(o)
+	return string(b)
 }
 
 func TeamMemberFromJson(data io.Reader) *TeamMember {
-	decoder := json.NewDecoder(data)
-	var o TeamMember
-	err := decoder.Decode(&o)
-	if err == nil {
-		return &o
-	} else {
-		return nil
-	}
+	var o *TeamMember
+	json.NewDecoder(data).Decode(&o)
+	return o
 }
 
 func TeamUnreadFromJson(data io.Reader) *TeamUnread {
-	decoder := json.NewDecoder(data)
-	var o TeamUnread
-	err := decoder.Decode(&o)
-	if err == nil {
-		return &o
-	} else {
-		return nil
-	}
+	var o *TeamUnread
+	json.NewDecoder(data).Decode(&o)
+	return o
 }
 
 func TeamMembersToJson(o []*TeamMember) string {
@@ -72,14 +54,9 @@ func TeamMembersToJson(o []*TeamMember) string {
 }
 
 func TeamMembersFromJson(data io.Reader) []*TeamMember {
-	decoder := json.NewDecoder(data)
 	var o []*TeamMember
-	err := decoder.Decode(&o)
-	if err == nil {
-		return o
-	} else {
-		return nil
-	}
+	json.NewDecoder(data).Decode(&o)
+	return o
 }
 
 func TeamsUnreadToJson(o []*TeamUnread) string {
@@ -91,14 +68,9 @@ func TeamsUnreadToJson(o []*TeamUnread) string {
 }
 
 func TeamsUnreadFromJson(data io.Reader) []*TeamUnread {
-	decoder := json.NewDecoder(data)
 	var o []*TeamUnread
-	err := decoder.Decode(&o)
-	if err == nil {
-		return o
-	} else {
-		return nil
-	}
+	json.NewDecoder(data).Decode(&o)
+	return o
 }
 
 func (o *TeamMember) IsValid() *AppError {
-- 
cgit v1.2.3-1-g7c22