Skip to content

Commit ac2fd9b

Browse files
authored
fixup some coding style divergences (#760)
1 parent 546590b commit ac2fd9b

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

openapi3/loader.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,7 @@ func (loader *Loader) resolveCallbackRef(doc *T, component *CallbackRef, documen
877877
if err != nil {
878878
return err
879879
}
880-
if err := loader.resolveCallbackRef(doc, &resolved, componentPath); err != nil {
880+
if err = loader.resolveCallbackRef(doc, &resolved, componentPath); err != nil {
881881
return err
882882
}
883883
component.Value = resolved.Value
@@ -890,8 +890,7 @@ func (loader *Loader) resolveCallbackRef(doc *T, component *CallbackRef, documen
890890
}
891891

892892
for _, pathItem := range *value {
893-
err := loader.resolvePathItemRef(doc, pathItem, documentPath)
894-
if err != nil {
893+
if err = loader.resolvePathItemRef(doc, pathItem, documentPath); err != nil {
895894
return err
896895
}
897896
}
@@ -964,8 +963,7 @@ func (loader *Loader) resolvePathItemRef(doc *T, pathItem *PathItem, documentPat
964963
*pathItem = p
965964
} else {
966965
var resolved PathItem
967-
doc, documentPath, err = loader.resolveComponent(doc, ref, documentPath, &resolved)
968-
if err != nil {
966+
if doc, documentPath, err = loader.resolveComponent(doc, ref, documentPath, &resolved); err != nil {
969967
return err
970968
}
971969
*pathItem = resolved

openapi3/schema.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,9 +1124,9 @@ func (schema *Schema) visitJSON(settings *schemaValidationSettings, value interf
11241124
// Catch slice of non-empty interface type
11251125
if reflect.TypeOf(value).Kind() == reflect.Slice {
11261126
valueR := reflect.ValueOf(value)
1127-
newValue := make([]interface{}, valueR.Len())
1127+
newValue := make([]interface{}, 0, valueR.Len())
11281128
for i := 0; i < valueR.Len(); i++ {
1129-
newValue[i] = valueR.Index(i).Interface()
1129+
newValue = append(newValue, valueR.Index(i).Interface())
11301130
}
11311131
return schema.visitJSONArray(settings, newValue)
11321132
}
@@ -1146,8 +1146,7 @@ func (schema *Schema) visitSetOperations(settings *schemaValidationSettings, val
11461146
switch c := value.(type) {
11471147
case json.Number:
11481148
var f float64
1149-
f, err = strconv.ParseFloat(c.String(), 64)
1150-
if err != nil {
1149+
if f, err = strconv.ParseFloat(c.String(), 64); err != nil {
11511150
return err
11521151
}
11531152
if v == f {

0 commit comments

Comments
 (0)