Chore: Enable Go linter gocritic (#26224)

* Chore: Enable gocritic linter Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-07-16 14:39:01 +02:00
parent 317c7b269c
commit d4e4cb4c71
43 changed files with 184 additions and 171 deletions
@@ -43,11 +43,11 @@ type User struct {
 func (u *User) NameOrFallback() string {
 	if u.Name != "" {
 		return u.Name
-	} else if u.Login != "" {
-		return u.Login
-	} else {
-		return u.Email
 	}
+	if u.Login != "" {
+		return u.Login
+	}
+	return u.Email
 }

 // ---------------------
@@ -192,11 +192,11 @@ func (u *SignedInUser) ShouldUpdateLastSeenAt() bool {
 func (u *SignedInUser) NameOrFallback() string {
 	if u.Name != "" {
 		return u.Name
-	} else if u.Login != "" {
-		return u.Login
-	} else {
-		return u.Email
 	}
+	if u.Login != "" {
+		return u.Login
+	}
+	return u.Email
 }

 type UpdateUserLastSeenAtCommand struct {