From 9146ba44f540cd77180093b2c8d87209760f6a93 Mon Sep 17 00:00:00 2001 From: andrey1s Date: Sun, 25 Oct 2020 19:33:33 +0300 Subject: [PATCH] update lint ST1016 --- input/flag/flag.go | 72 +++++++++++++++++++++++----------------------- input/type.go | 8 +++--- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/input/flag/flag.go b/input/flag/flag.go index d94b8ee..c1a2e2b 100644 --- a/input/flag/flag.go +++ b/input/flag/flag.go @@ -19,77 +19,77 @@ const ( Any // any ) -func (f Flag) With(v Flag) Flag { - return f | v +func (i Flag) With(v Flag) Flag { + return i | v } -func (f Flag) IsString() bool { - return f|Required|Array^Required^Array == 0 +func (i Flag) IsString() bool { + return i|Required|Array^Required^Array == 0 } -func (f Flag) IsRequired() bool { - return f&Required > 0 +func (i Flag) IsRequired() bool { + return i&Required > 0 } -func (f Flag) IsArray() bool { - return f&Array > 0 +func (i Flag) IsArray() bool { + return i&Array > 0 } -func (f Flag) IsInt() bool { - return f&Int > 0 +func (i Flag) IsInt() bool { + return i&Int > 0 } -func (f Flag) IsInt64() bool { - return f&Int64 > 0 +func (i Flag) IsInt64() bool { + return i&Int64 > 0 } -func (f Flag) IsUint() bool { - return f&Uint > 0 +func (i Flag) IsUint() bool { + return i&Uint > 0 } -func (f Flag) IsUint64() bool { - return f&Uint64 > 0 +func (i Flag) IsUint64() bool { + return i&Uint64 > 0 } -func (f Flag) IsFloat64() bool { - return f&Float64 > 0 +func (i Flag) IsFloat64() bool { + return i&Float64 > 0 } -func (f Flag) IsBool() bool { - return f&Bool > 0 +func (i Flag) IsBool() bool { + return i&Bool > 0 } -func (f Flag) IsDuration() bool { - return f&Duration > 0 +func (i Flag) IsDuration() bool { + return i&Duration > 0 } -func (f Flag) IsTime() bool { - return f&Time > 0 +func (i Flag) IsTime() bool { + return i&Time > 0 } -func (f Flag) IsAny() bool { - return f&Any > 0 +func (i Flag) IsAny() bool { + return i&Any > 0 } -func (f Flag) Type() Flag { +func (i Flag) Type() Flag { switch { - case f.IsInt(): + case i.IsInt(): return Int - case f.IsInt64(): + case i.IsInt64(): return Int64 - case f.IsUint(): + case i.IsUint(): return Uint - case f.IsUint64(): + case i.IsUint64(): return Uint64 - case f.IsFloat64(): + case i.IsFloat64(): return Float64 - case f.IsBool(): + case i.IsBool(): return Bool - case f.IsDuration(): + case i.IsDuration(): return Duration - case f.IsTime(): + case i.IsTime(): return Time - case f.IsAny(): + case i.IsAny(): return Any default: return String diff --git a/input/type.go b/input/type.go index b8f4dbd..5ff68be 100644 --- a/input/type.go +++ b/input/type.go @@ -9,10 +9,10 @@ const ( Option // option ) -func (t Type) IsArgument() bool { - return t == Argument +func (i Type) IsArgument() bool { + return i == Argument } -func (t Type) IsOption() bool { - return t == Option +func (i Type) IsOption() bool { + return i == Option }