chore(internal): use explicit returns in more places

stainless-app[bot] · stainless-app[bot] · commit 85aeba970207 · 2026-03-11T08:04:25.000Z
diff --git a/internal/apiform/encoder.go b/internal/apiform/encoder.go
@@ -469,5 +469,5 @@ func WriteExtras(writer *multipart.Writer, extras map[string]any) (err error) {
 			break
 		}
 	}
-	return
+	return err
 }
diff --git a/internal/apiform/tag.go b/internal/apiform/tag.go
@@ -24,7 +24,7 @@ func parseFormStructTag(field reflect.StructField) (tag parsedStructTag, ok bool
 		raw, ok = field.Tag.Lookup(jsonStructTag)
 	}
 	if !ok {
-		return
+		return tag, ok
 	}
 	parts := strings.Split(raw, ",")
 	if len(parts) == 0 {
@@ -45,7 +45,7 @@ func parseFormStructTag(field reflect.StructField) (tag parsedStructTag, ok bool
 	}
 
 	parseApiStructTag(field, &tag)
-	return
+	return tag, ok
 }
 
 func parseApiStructTag(field reflect.StructField, tag *parsedStructTag) {
@@ -68,5 +68,5 @@ func parseApiStructTag(field reflect.StructField, tag *parsedStructTag) {
 
 func parseFormatStructTag(field reflect.StructField) (format string, ok bool) {
 	format, ok = field.Tag.Lookup(formatStructTag)
-	return
+	return format, ok
 }
diff --git a/internal/apijson/encoder.go b/internal/apijson/encoder.go
@@ -286,7 +286,7 @@ func (e *encoder) newStructTypeEncoder(t reflect.Type) encoderFunc {
 				return nil, err
 			}
 		}
-		return
+		return json, err
 	}
 }
 
diff --git a/internal/apijson/json_test.go b/internal/apijson/json_test.go
@@ -268,7 +268,7 @@ type MarshallingUnionStruct struct {
 func (r *MarshallingUnionStruct) UnmarshalJSON(data []byte) (err error) {
 	*r = MarshallingUnionStruct{}
 	err = UnmarshalRoot(data, &r.Union)
-	return
+	return err
 }
 
 func (r MarshallingUnionStruct) MarshalJSON() (data []byte, err error) {
diff --git a/internal/apijson/tag.go b/internal/apijson/tag.go
@@ -20,7 +20,7 @@ type parsedStructTag struct {
 func parseJSONStructTag(field reflect.StructField) (tag parsedStructTag, ok bool) {
 	raw, ok := field.Tag.Lookup(jsonStructTag)
 	if !ok {
-		return
+		return tag, ok
 	}
 	parts := strings.Split(raw, ",")
 	if len(parts) == 0 {
@@ -42,7 +42,7 @@ func parseJSONStructTag(field reflect.StructField) (tag parsedStructTag, ok bool
 
 	// the `api` struct tag is only used alongside `json` for custom behaviour
 	parseApiStructTag(field, &tag)
-	return
+	return tag, ok
 }
 
 func parseApiStructTag(field reflect.StructField, tag *parsedStructTag) {
@@ -65,5 +65,5 @@ func parseApiStructTag(field reflect.StructField, tag *parsedStructTag) {
 
 func parseFormatStructTag(field reflect.StructField) (format string, ok bool) {
 	format, ok = field.Tag.Lookup(formatStructTag)
-	return
+	return format, ok
 }
diff --git a/internal/apiquery/encoder.go b/internal/apiquery/encoder.go
@@ -103,7 +103,7 @@ func (e *encoder) newTypeEncoder(t reflect.Type) encoderFunc {
 		encoder := e.typeEncoder(t.Elem())
 		return func(key string, value reflect.Value) (pairs []Pair, err error) {
 			if !value.IsValid() || value.IsNil() {
-				return
+				return pairs, err
 			}
 			return encoder(key, value.Elem())
 		}
@@ -205,7 +205,7 @@ func (e *encoder) newStructTypeEncoder(t reflect.Type) encoderFunc {
 			}
 			pairs = append(pairs, subpairs...)
 		}
-		return
+		return pairs, err
 	}
 }
 
@@ -256,7 +256,7 @@ func (e *encoder) newMapEncoder(t reflect.Type) encoderFunc {
 			}
 			pairs = append(pairs, subpairs...)
 		}
-		return
+		return pairs, err
 	}
 }
 
@@ -300,7 +300,7 @@ func (e *encoder) newArrayTypeEncoder(t reflect.Type) encoderFunc {
 				}
 				pairs = append(pairs, subpairs...)
 			}
-			return
+			return pairs, err
 		}
 	case ArrayQueryFormatIndices:
 		panic("The array indices format is not supported yet")
@@ -315,7 +315,7 @@ func (e *encoder) newArrayTypeEncoder(t reflect.Type) encoderFunc {
 				}
 				pairs = append(pairs, subpairs...)
 			}
-			return
+			return pairs, err
 		}
 	default:
 		panic(fmt.Sprintf("Unknown ArrayFormat value: %d", e.settings.ArrayFormat))
diff --git a/internal/apiquery/tag.go b/internal/apiquery/tag.go
@@ -18,7 +18,7 @@ type parsedStructTag struct {
 func parseQueryStructTag(field reflect.StructField) (tag parsedStructTag, ok bool) {
 	raw, ok := field.Tag.Lookup(queryStructTag)
 	if !ok {
-		return
+		return tag, ok
 	}
 	parts := strings.Split(raw, ",")
 	if len(parts) == 0 {
@@ -35,10 +35,10 @@ func parseQueryStructTag(field reflect.StructField) (tag parsedStructTag, ok boo
 			tag.inline = true
 		}
 	}
-	return
+	return tag, ok
 }
 
 func parseFormatStructTag(field reflect.StructField) (format string, ok bool) {
 	format, ok = field.Tag.Lookup(formatStructTag)
-	return
+	return format, ok
 }

Original file line number	Diff line number	Diff line change
`@@ -469,5 +469,5 @@ func WriteExtras(writer *multipart.Writer, extras map[string]any) (err error) {`
`469`	`469`	`break`
`470`	`470`	`}`
`471`	`471`	`}`
`472`		`- return`
	`472`	`+ return err`
`473`	`473`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func parseFormStructTag(field reflect.StructField) (tag parsedStructTag, ok bool`
`24`	`24`	`raw, ok = field.Tag.Lookup(jsonStructTag)`
`25`	`25`	`}`
`26`	`26`	`if !ok {`
`27`		`- return`
	`27`	`+ return tag, ok`
`28`	`28`	`}`
`29`	`29`	`parts := strings.Split(raw, ",")`
`30`	`30`	`if len(parts) == 0 {`
`@@ -45,7 +45,7 @@ func parseFormStructTag(field reflect.StructField) (tag parsedStructTag, ok bool`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`parseApiStructTag(field, &tag)`
`48`		`- return`
	`48`	`+ return tag, ok`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`func parseApiStructTag(field reflect.StructField, tag *parsedStructTag) {`
`@@ -68,5 +68,5 @@ func parseApiStructTag(field reflect.StructField, tag *parsedStructTag) {`
`68`	`68`
`69`	`69`	`func parseFormatStructTag(field reflect.StructField) (format string, ok bool) {`
`70`	`70`	`format, ok = field.Tag.Lookup(formatStructTag)`
`71`		`- return`
	`71`	`+ return format, ok`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ func (e *encoder) newStructTypeEncoder(t reflect.Type) encoderFunc {`
`286`	`286`	`return nil, err`
`287`	`287`	`}`
`288`	`288`	`}`
`289`		`- return`
	`289`	`+ return json, err`
`290`	`290`	`}`
`291`	`291`	`}`
`292`	`292`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ type MarshallingUnionStruct struct {`
`268`	`268`	`func (r *MarshallingUnionStruct) UnmarshalJSON(data []byte) (err error) {`
`269`	`269`	`*r = MarshallingUnionStruct{}`
`270`	`270`	`err = UnmarshalRoot(data, &r.Union)`
`271`		`- return`
	`271`	`+ return err`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`func (r MarshallingUnionStruct) MarshalJSON() (data []byte, err error) {`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func (e *encoder) newTypeEncoder(t reflect.Type) encoderFunc {`
`103`	`103`	`encoder := e.typeEncoder(t.Elem())`
`104`	`104`	`return func(key string, value reflect.Value) (pairs []Pair, err error) {`
`105`	`105`	`if !value.IsValid() \|\| value.IsNil() {`
`106`		`- return`
	`106`	`+ return pairs, err`
`107`	`107`	`}`
`108`	`108`	`return encoder(key, value.Elem())`
`109`	`109`	`}`
`@@ -205,7 +205,7 @@ func (e *encoder) newStructTypeEncoder(t reflect.Type) encoderFunc {`
`205`	`205`	`}`
`206`	`206`	`pairs = append(pairs, subpairs...)`
`207`	`207`	`}`
`208`		`- return`
	`208`	`+ return pairs, err`
`209`	`209`	`}`
`210`	`210`	`}`
`211`	`211`
`@@ -256,7 +256,7 @@ func (e *encoder) newMapEncoder(t reflect.Type) encoderFunc {`
`256`	`256`	`}`
`257`	`257`	`pairs = append(pairs, subpairs...)`
`258`	`258`	`}`
`259`		`- return`
	`259`	`+ return pairs, err`
`260`	`260`	`}`
`261`	`261`	`}`
`262`	`262`
`@@ -300,7 +300,7 @@ func (e *encoder) newArrayTypeEncoder(t reflect.Type) encoderFunc {`
`300`	`300`	`}`
`301`	`301`	`pairs = append(pairs, subpairs...)`
`302`	`302`	`}`
`303`		`- return`
	`303`	`+ return pairs, err`
`304`	`304`	`}`
`305`	`305`	`case ArrayQueryFormatIndices:`
`306`	`306`	`panic("The array indices format is not supported yet")`
`@@ -315,7 +315,7 @@ func (e *encoder) newArrayTypeEncoder(t reflect.Type) encoderFunc {`
`315`	`315`	`}`
`316`	`316`	`pairs = append(pairs, subpairs...)`
`317`	`317`	`}`
`318`		`- return`
	`318`	`+ return pairs, err`
`319`	`319`	`}`
`320`	`320`	`default:`
`321`	`321`	`panic(fmt.Sprintf("Unknown ArrayFormat value: %d", e.settings.ArrayFormat))`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ type parsedStructTag struct {`
`18`	`18`	`func parseQueryStructTag(field reflect.StructField) (tag parsedStructTag, ok bool) {`
`19`	`19`	`raw, ok := field.Tag.Lookup(queryStructTag)`
`20`	`20`	`if !ok {`
`21`		`- return`
	`21`	`+ return tag, ok`
`22`	`22`	`}`
`23`	`23`	`parts := strings.Split(raw, ",")`
`24`	`24`	`if len(parts) == 0 {`
`@@ -35,10 +35,10 @@ func parseQueryStructTag(field reflect.StructField) (tag parsedStructTag, ok boo`
`35`	`35`	`tag.inline = true`
`36`	`36`	`}`
`37`	`37`	`}`
`38`		`- return`
	`38`	`+ return tag, ok`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`func parseFormatStructTag(field reflect.StructField) (format string, ok bool) {`
`42`	`42`	`format, ok = field.Tag.Lookup(formatStructTag)`
`43`		`- return`
	`43`	`+ return format, ok`
`44`	`44`	`}`