Fix go vet faults (#1060)

This commit is contained in:
Ethan Koenig 2017-02-26 00:25:35 -05:00 committed by Lunny Xiao
parent bf24099114
commit 831ff41754
2 changed files with 10 additions and 4 deletions

View file

@ -28,9 +28,9 @@ func createContext(req *http.Request) (*macaron.Context, *httptest.ResponseRecor
resp := httptest.NewRecorder() resp := httptest.NewRecorder()
c := &macaron.Context{ c := &macaron.Context{
Injector: inject.New(), Injector: inject.New(),
Req: macaron.Request{req}, Req: macaron.Request{Request: req},
Resp: macaron.NewResponseWriter(resp), Resp: macaron.NewResponseWriter(resp),
Render: &macaron.DummyRender{resp}, Render: &macaron.DummyRender{ResponseWriter: resp},
Data: make(map[string]interface{}), Data: make(map[string]interface{}),
} }
c.Map(c) c.Map(c)

View file

@ -22,7 +22,10 @@ func ListAccessTokens(ctx *context.APIContext) {
apiTokens := make([]*api.AccessToken, len(tokens)) apiTokens := make([]*api.AccessToken, len(tokens))
for i := range tokens { for i := range tokens {
apiTokens[i] = &api.AccessToken{tokens[i].Name, tokens[i].Sha1} apiTokens[i] = &api.AccessToken{
Name: tokens[i].Name,
Sha1: tokens[i].Sha1,
}
} }
ctx.JSON(200, &apiTokens) ctx.JSON(200, &apiTokens)
} }
@ -38,5 +41,8 @@ func CreateAccessToken(ctx *context.APIContext, form api.CreateAccessTokenOption
ctx.Error(500, "NewAccessToken", err) ctx.Error(500, "NewAccessToken", err)
return return
} }
ctx.JSON(201, &api.AccessToken{t.Name, t.Sha1}) ctx.JSON(201, &api.AccessToken{
Name: t.Name,
Sha1: t.Sha1,
})
} }