vinchent/gin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: remove else instead of return/continue (#1502)

Browse Source 
As[ Effective Go](https://golang.org/doc/effective_go.html?#if) about `if` said, remove else statement instead of return/continue statement.
This commit is contained in:
田欧 2018-08-20 21:49:24 +08:00 committed by Bo-Yi Wu
parent 0ebd42d0a9
commit 85f3e78abc
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
binding/form_mapping.go
View File

@ -74,16 +74,16 @@ func mapForm(ptr interface{}, form map[string][]string) error {
} }
} }
val.Field(i).Set(slice) val.Field(i).Set(slice)
} else { continue
if _, isTime := structField.Interface().(time.Time); isTime { }
if err := setTimeField(inputValue[0], typeField, structField); err != nil { if _, isTime := structField.Interface().(time.Time); isTime {
return err if err := setTimeField(inputValue[0], typeField, structField); err != nil {
}
continue
}
if err := setWithProperType(typeField.Type.Kind(), inputValue[0], structField); err != nil {
return err return err
} }
continue
}
if err := setWithProperType(typeField.Type.Kind(), inputValue[0], structField); err != nil {
return err
} }
} }
return nil return nil

8
context.go
View File

@ -665,9 +665,9 @@ func (c *Context) Status(code int) {
func (c *Context) Header(key, value string) { func (c *Context) Header(key, value string) {
if value == "" { if value == "" {
c.Writer.Header().Del(key) c.Writer.Header().Del(key)
} else { return
c.Writer.Header().Set(key, value)
} }
c.Writer.Header().Set(key, value)
} }
// GetHeader returns value from request headers. // GetHeader returns value from request headers.
@ -755,9 +755,9 @@ func (c *Context) JSONP(code int, obj interface{}) {
callback := c.DefaultQuery("callback", "") callback := c.DefaultQuery("callback", "")
if callback == "" { if callback == "" {
c.Render(code, render.JSON{Data: obj}) c.Render(code, render.JSON{Data: obj})
} else { return
c.Render(code, render.JsonpJSON{Callback: callback, Data: obj})
} }
c.Render(code, render.JsonpJSON{Callback: callback, Data: obj})
} }
// JSON serializes the given struct as JSON into the response body. // JSON serializes the given struct as JSON into the response body.

6
render/json.go
View File

@ -128,10 +128,8 @@ func (r AsciiJSON) Render(w http.ResponseWriter) (err error) {
var buffer bytes.Buffer var buffer bytes.Buffer
for _, r := range string(ret) { for _, r := range string(ret) {
cvt := "" cvt := string(r)
if r < 128 { if r >= 128 {
cvt = string(r)
} else {
cvt = fmt.Sprintf("\\u%04x", int64(r)) cvt = fmt.Sprintf("\\u%04x", int64(r))
} }
buffer.WriteString(cvt) buffer.WriteString(cvt)