simplify the nil check expression

reugn · reugn · commit 6364605b5ebb · 2024-03-07T18:43:52.000+02:00
diff --git a/genai/client.go b/genai/client.go
@@ -146,11 +146,8 @@ func (m *GenerativeModel) generateContent(ctx context.Context, req *pb.GenerateC
 	}
 	for {
 		_, err := iter.Next()
-		if err == iterator.Done {
-			if iter.merged != nil {
-				return iter.merged, nil
-			}
-			return nil, err
+		if err == iterator.Done && iter.merged != nil {
+			return iter.merged, nil
 		}
 		if err != nil {
 			return nil, err

Original file line number	Diff line number	Diff line change
`@@ -146,11 +146,8 @@ func (m GenerativeModel) generateContent(ctx context.Context, req pb.GenerateC`
`146`	`146`	`}`
`147`	`147`	`for {`
`148`	`148`	`_, err := iter.Next()`
`149`		`- if err == iterator.Done {`
`150`		`- if iter.merged != nil {`
`151`		`- return iter.merged, nil`
`152`		`- }`
`153`		`- return nil, err`
	`149`	`+ if err == iterator.Done && iter.merged != nil {`
	`150`	`+ return iter.merged, nil`
`154`	`151`	`}`
`155`	`152`	`if err != nil {`
`156`	`153`	`return nil, err`