From 0772cae3142dc153c056157dbba624ddecad2e02 Mon Sep 17 00:00:00 2001 From: albertony <12441419+albertony@users.noreply.github.com> Date: Fri, 24 Jun 2022 16:01:19 +0200 Subject: [PATCH] staticcheck: use result of type assertion to simplify cases --- backend/union/union.go | 6 +++--- backend/union/upstream/upstream.go | 6 +++--- fs/operations/reopen.go | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/union/union.go b/backend/union/union.go index e1ec53e85..c93fc0649 100644 --- a/backend/union/union.go +++ b/backend/union/union.go @@ -85,16 +85,16 @@ func (f *Fs) wrapEntries(entries ...upstream.Entry) (entry, error) { if err != nil { return nil, err } - switch e.(type) { + switch e := e.(type) { case *upstream.Object: return &Object{ - Object: e.(*upstream.Object), + Object: e, fs: f, co: entries, }, nil case *upstream.Directory: return &Directory{ - Directory: e.(*upstream.Directory), + Directory: e, cd: entries, }, nil default: diff --git a/backend/union/upstream/upstream.go b/backend/union/upstream/upstream.go index c6e906107..06f3b9014 100644 --- a/backend/union/upstream/upstream.go +++ b/backend/union/upstream/upstream.go @@ -129,11 +129,11 @@ func (f *Fs) WrapObject(o fs.Object) *Object { // WrapEntry wraps an fs.DirEntry to include the info // of the upstream Fs func (f *Fs) WrapEntry(e fs.DirEntry) (Entry, error) { - switch e.(type) { + switch e := e.(type) { case fs.Object: - return f.WrapObject(e.(fs.Object)), nil + return f.WrapObject(e), nil case fs.Directory: - return f.WrapDirectory(e.(fs.Directory)), nil + return f.WrapDirectory(e), nil default: return nil, fmt.Errorf("unknown object type %T", e) } diff --git a/fs/operations/reopen.go b/fs/operations/reopen.go index 1f575d7cc..e0f38cfcb 100644 --- a/fs/operations/reopen.go +++ b/fs/operations/reopen.go @@ -59,11 +59,11 @@ func (h *ReOpen) open() error { var hashOption *fs.HashesOption var rangeOption *fs.RangeOption for _, option := range h.options { - switch option.(type) { + switch option := option.(type) { case *fs.HashesOption: - hashOption = option.(*fs.HashesOption) + hashOption = option case *fs.RangeOption: - rangeOption = option.(*fs.RangeOption) + rangeOption = option case *fs.HTTPOption: opts = append(opts, option) default: