From 58b8e7a98c5a40354f478c880bf4be93690638e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Wed, 11 Oct 2023 18:00:46 +0900 Subject: [PATCH] reduce unsafe --- codegen/getopenapiof/main.go | 4 +--- codegen/patchopenapiof/main.go | 3 +-- codegen/postopenapiof/main.go | 3 +-- codegen/putopenapiof/main.go | 3 +-- openapi_codegen_getopenapiof.go | 20 +++++++++----------- openapi_codegen_patchopenapiof.go | 5 ++--- openapi_codegen_postopenapiof.go | 7 +++---- openapi_codegen_putopenapiof.go | 3 +-- 8 files changed, 19 insertions(+), 29 deletions(-) diff --git a/codegen/getopenapiof/main.go b/codegen/getopenapiof/main.go index cd20cd7..c6f6a5e 100644 --- a/codegen/getopenapiof/main.go +++ b/codegen/getopenapiof/main.go @@ -10,8 +10,6 @@ const head = `// Code generated by codegen/getopenapiof. DO NOT EDIT. package nano import ( - "unsafe" - "github.com/pkg/errors" ) ` @@ -26,7 +24,7 @@ func (bot *Bot) getOpenAPIof[T any](ep string) (*[T any], error) { if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*[T any])(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.[T any], err } ` diff --git a/codegen/patchopenapiof/main.go b/codegen/patchopenapiof/main.go index 7f8d439..cb72d66 100644 --- a/codegen/patchopenapiof/main.go +++ b/codegen/patchopenapiof/main.go @@ -11,7 +11,6 @@ package nano import ( "io" - "unsafe" "github.com/pkg/errors" ) @@ -27,7 +26,7 @@ func (bot *Bot) patchOpenAPIof[T any](ep string, body io.Reader) (*[T any], erro if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*[T any])(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.[T any], err } ` diff --git a/codegen/postopenapiof/main.go b/codegen/postopenapiof/main.go index 6753efe..d3924d6 100644 --- a/codegen/postopenapiof/main.go +++ b/codegen/postopenapiof/main.go @@ -11,7 +11,6 @@ package nano import ( "io" - "unsafe" "github.com/pkg/errors" ) @@ -27,7 +26,7 @@ func (bot *Bot) postOpenAPIof[T any](ep, contenttype string, body io.Reader) (*[ if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*[T any])(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.[T any], err } ` diff --git a/codegen/putopenapiof/main.go b/codegen/putopenapiof/main.go index 11b6730..f9ee5dd 100644 --- a/codegen/putopenapiof/main.go +++ b/codegen/putopenapiof/main.go @@ -11,7 +11,6 @@ package nano import ( "io" - "unsafe" "github.com/pkg/errors" ) @@ -27,7 +26,7 @@ func (bot *Bot) putOpenAPIof[T any](ep string, body io.Reader) (*[T any], error) if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*[T any])(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.[T any], err } ` diff --git a/openapi_codegen_getopenapiof.go b/openapi_codegen_getopenapiof.go index 9fcf172..75640b2 100644 --- a/openapi_codegen_getopenapiof.go +++ b/openapi_codegen_getopenapiof.go @@ -3,8 +3,6 @@ package nano import ( - "unsafe" - "github.com/pkg/errors" ) @@ -17,7 +15,7 @@ func (bot *Bot) getOpenAPIofShardWSSGateway(ep string) (*ShardWSSGateway, error) if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*ShardWSSGateway)(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.ShardWSSGateway, err } func (bot *Bot) getOpenAPIofUser(ep string) (*User, error) { @@ -29,7 +27,7 @@ func (bot *Bot) getOpenAPIofUser(ep string) (*User, error) { if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*User)(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.User, err } func (bot *Bot) getOpenAPIofGuild(ep string) (*Guild, error) { @@ -41,7 +39,7 @@ func (bot *Bot) getOpenAPIofGuild(ep string) (*Guild, error) { if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*Guild)(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.Guild, err } func (bot *Bot) getOpenAPIofChannel(ep string) (*Channel, error) { @@ -53,7 +51,7 @@ func (bot *Bot) getOpenAPIofChannel(ep string) (*Channel, error) { if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*Channel)(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.Channel, err } func (bot *Bot) getOpenAPIofMember(ep string) (*Member, error) { @@ -65,7 +63,7 @@ func (bot *Bot) getOpenAPIofMember(ep string) (*Member, error) { if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*Member)(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.Member, err } func (bot *Bot) getOpenAPIofRoleMembers(ep string) (*RoleMembers, error) { @@ -77,7 +75,7 @@ func (bot *Bot) getOpenAPIofRoleMembers(ep string) (*RoleMembers, error) { if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*RoleMembers)(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.RoleMembers, err } func (bot *Bot) getOpenAPIofGuildRoleList(ep string) (*GuildRoleList, error) { @@ -89,7 +87,7 @@ func (bot *Bot) getOpenAPIofGuildRoleList(ep string) (*GuildRoleList, error) { if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*GuildRoleList)(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.GuildRoleList, err } func (bot *Bot) getOpenAPIofChannelPermissions(ep string) (*ChannelPermissions, error) { @@ -101,7 +99,7 @@ func (bot *Bot) getOpenAPIofChannelPermissions(ep string) (*ChannelPermissions, if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*ChannelPermissions)(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.ChannelPermissions, err } func (bot *Bot) getOpenAPIofMessage(ep string) (*Message, error) { @@ -113,5 +111,5 @@ func (bot *Bot) getOpenAPIofMessage(ep string) (*Message, error) { if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*Message)(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.Message, err } diff --git a/openapi_codegen_patchopenapiof.go b/openapi_codegen_patchopenapiof.go index 22edfa1..4e6ef74 100644 --- a/openapi_codegen_patchopenapiof.go +++ b/openapi_codegen_patchopenapiof.go @@ -4,7 +4,6 @@ package nano import ( "io" - "unsafe" "github.com/pkg/errors" ) @@ -18,7 +17,7 @@ func (bot *Bot) patchOpenAPIofChannel(ep string, body io.Reader) (*Channel, erro if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*Channel)(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.Channel, err } func (bot *Bot) patchOpenAPIofGuildRolePatch(ep string, body io.Reader) (*GuildRolePatch, error) { @@ -30,5 +29,5 @@ func (bot *Bot) patchOpenAPIofGuildRolePatch(ep string, body io.Reader) (*GuildR if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*GuildRolePatch)(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.GuildRolePatch, err } diff --git a/openapi_codegen_postopenapiof.go b/openapi_codegen_postopenapiof.go index 44d6438..4ee7517 100644 --- a/openapi_codegen_postopenapiof.go +++ b/openapi_codegen_postopenapiof.go @@ -4,7 +4,6 @@ package nano import ( "io" - "unsafe" "github.com/pkg/errors" ) @@ -18,7 +17,7 @@ func (bot *Bot) postOpenAPIofChannel(ep, contenttype string, body io.Reader) (*C if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*Channel)(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.Channel, err } func (bot *Bot) postOpenAPIofGuildRoleCreate(ep, contenttype string, body io.Reader) (*GuildRoleCreate, error) { @@ -30,7 +29,7 @@ func (bot *Bot) postOpenAPIofGuildRoleCreate(ep, contenttype string, body io.Rea if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*GuildRoleCreate)(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.GuildRoleCreate, err } func (bot *Bot) postOpenAPIofMessage(ep, contenttype string, body io.Reader) (*Message, error) { @@ -42,5 +41,5 @@ func (bot *Bot) postOpenAPIofMessage(ep, contenttype string, body io.Reader) (*M if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*Message)(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.Message, err } diff --git a/openapi_codegen_putopenapiof.go b/openapi_codegen_putopenapiof.go index ac4a895..0a41d42 100644 --- a/openapi_codegen_putopenapiof.go +++ b/openapi_codegen_putopenapiof.go @@ -4,7 +4,6 @@ package nano import ( "io" - "unsafe" "github.com/pkg/errors" ) @@ -18,5 +17,5 @@ func (bot *Bot) putOpenAPIofGuildRoleChannelID(ep string, body io.Reader) (*Guil if err != nil { err = errors.Wrap(err, getCallerFuncName()) } - return (*GuildRoleChannelID)(unsafe.Add(unsafe.Pointer(resp), unsafe.Sizeof(CodeMessageBase{}))), err + return &resp.GuildRoleChannelID, err }