Skip to content

Commit e5d2cc7

Browse files
committed
update some comments
1 parent c2bc88e commit e5d2cc7

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

context_render.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ func (c *Context) Respond(status int, obj interface{}, renderer render.Renderer)
2929

3030
err := renderer.Render(c.Resp, obj)
3131
if err != nil {
32-
panic(err) // TODO or use AddError()
32+
// panic(err) // TODO or use AddError()
33+
c.AddError(err)
3334
}
3435
}
3536

@@ -96,7 +97,9 @@ func (c *Context) Stream(status int, contentType string, r io.Reader) {
9697
_, err := io.Copy(c.Resp, r)
9798

9899
if err != nil {
99-
panic(err)
100+
// TODO use AddError()
101+
// panic(err)
102+
c.AddError(err)
100103
}
101104
}
102105

extends.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ type Validator interface {
2626
* Context function extends()
2727
*************************************************************/
2828

29-
// Render context template
29+
// Render context template.
30+
//
31+
// please use ShouldRender() instead
3032
func (c *Context) Render(status int, name string, data interface{}) (err error) {
3133
if c.router.Renderer == nil {
3234
return errors.New("renderer not registered")
@@ -43,7 +45,7 @@ func (c *Context) Render(status int, name string, data interface{}) (err error)
4345

4446
// Validate context validator
4547
// Deprecated
46-
// please use ShouldBind(), it will auto call validator.
48+
// please use ShouldBind() instead, it will auto call validator.
4749
func (c *Context) Validate(i interface{}) error {
4850
if c.Router().Validator == nil {
4951
return errors.New("validator not registered")

render/json.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@ func (r JSONRenderer) Render(w http.ResponseWriter, obj interface{}) (err error)
2929
enc.SetEscapeHTML(false)
3030
}
3131

32-
if err = enc.Encode(obj); err != nil {
33-
return err
34-
}
35-
36-
return err
32+
return enc.Encode(obj)
3733
}
3834

3935
// JSON response rendering

router.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,10 @@ type Router struct {
9696
// Extends tools
9797
//
9898
// Renderer template(view) interface
99+
// Deprecated
99100
Renderer Renderer
100101
// Validator validator interface
102+
// Deprecated
101103
Validator Validator
102104
}
103105

0 commit comments

Comments
 (0)