From ca0ecbfc58642437da488e008805e41ba7066578 Mon Sep 17 00:00:00 2001 From: "kazuhiro.seida" Date: Mon, 17 May 2021 16:45:11 +0900 Subject: [PATCH 1/2] into pointer receiver --- utils/assert.go | 26 +++++++++++++------------- utils/judge.go | 12 ++++++------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/utils/assert.go b/utils/assert.go index 58a0c73..3022f7c 100644 --- a/utils/assert.go +++ b/utils/assert.go @@ -7,72 +7,72 @@ import ( "github.com/fcfcqloow/go-advance/log" ) -func EAssert(err error) Assert { - instance := Assert{ +func EAssert(err error) *Assert { + instance := &Assert{ Err: err, } return instance } -func (self Assert) Log() Assert { +func (self *Assert) Log() *Assert { if self.Err != nil { log.Error(self.Err.Error()) } return self } -func (self Assert) OnErr(errFn func()) Assert { +func (self *Assert) OnErr(errFn func()) *Assert { if self.Err != nil { errFn() } return self } -func (self Assert) NoneErr(elseFun func()) Assert { +func (self *Assert) NoneErr(elseFun func()) *Assert { if self.Err == nil { elseFun() } return self } -func (self Assert) NoneErrAssert(e error) Assert { +func (self *Assert) NoneErrAssert(e error) *Assert { if self.Err == nil { self.Err = e } return self } -func (self Assert) NoneErrPrintln(str ...interface{}) Assert { +func (self *Assert) NoneErrPrintln(str ...interface{}) *Assert { if self.Err == nil { fmt.Println(str...) } return self } -func (self Assert) NoneErrPrint(str ...interface{}) Assert { +func (self *Assert) NoneErrPrint(str ...interface{}) *Assert { if self.Err == nil { fmt.Print(str...) } return self } -func (self Assert) ExitWith(number int) Assert { +func (self *Assert) ExitWith(number int) *Assert { if self.Err != nil { os.Exit(number) } return self } -func (self Assert) Exit() Assert { +func (self *Assert) Exit() *Assert { if self.Err != nil { os.Exit(1) } return self } -func (self Assert) Return() error { +func (self *Assert) Return() error { return self.Err } -func (self Assert) ErrNotNil() bool { +func (self *Assert) ErrNotNil() bool { return self.Err != nil } -func (self Assert) ErrNil() bool { +func (self *Assert) ErrNil() bool { return self.Err == nil } diff --git a/utils/judge.go b/utils/judge.go index 03712f2..f27032a 100644 --- a/utils/judge.go +++ b/utils/judge.go @@ -1,29 +1,29 @@ package utils -func Is(flag bool) Judge { - return Judge{flag: flag} +func Is(flag bool) *Judge { + return &Judge{flag: flag} } -func (judge Judge) True(val interface{}) Judge { +func (judge *Judge) True(val interface{}) *Judge { if judge.flag == true { judge.Value = val } return judge } -func (judge Judge) False(val interface{}) Judge { +func (judge *Judge) False(val interface{}) *Judge { if judge.flag == false { judge.Value = val } return judge } -func (judge Judge) T(val interface{}) Judge { +func (judge *Judge) T(val interface{}) *Judge { if judge.flag == true { judge.Value = val } return judge } -func (judge Judge) F(val interface{}) Judge { +func (judge *Judge) F(val interface{}) *Judge { if judge.flag == false { judge.Value = val } From 3c41c473109a89173485f5003b6eb64f3b009d66 Mon Sep 17 00:00:00 2001 From: "kazuhiro.seida" Date: Tue, 18 May 2021 12:44:34 +0900 Subject: [PATCH 2/2] fix out --- utils/init.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/init.go b/utils/init.go index 5be8e2d..5f0dd35 100644 --- a/utils/init.go +++ b/utils/init.go @@ -12,7 +12,7 @@ var ( IsWindows = (runtime.GOOS == "windows") IsLinux = (runtime.GOOS == "linux") IsMac = (runtime.GOOS == "darwin") - Console = out{} + Console = out{writer: Out} ) type (