From 2fd8b5f1dd5d885bb877bb096001a20bbc2dffb3 Mon Sep 17 00:00:00 2001 From: reltuk Date: Mon, 15 Aug 2022 20:08:47 +0000 Subject: [PATCH] [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh --- go/store/nbs/gc_copier.go | 2 +- go/store/nbs/store.go | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/go/store/nbs/gc_copier.go b/go/store/nbs/gc_copier.go index 6c6914e353..9ebd3354d6 100644 --- a/go/store/nbs/gc_copier.go +++ b/go/store/nbs/gc_copier.go @@ -63,7 +63,7 @@ func (gcc *gcCopier) addChunk(ctx context.Context, c CompressedChunk) error { return gcc.writer.AddCmpChunk(c) } -func (gcc *gcCopier) copyTablesToDir(ctx context.Context, destDir string) (ts []tableSpec, err error) { +func (gcc *gcCopier) copyTablesToDir(ctx context.Context, destDir string) (ts []tableSpec, err error) { var filename string filename, err = gcc.writer.Finish() if err != nil { diff --git a/go/store/nbs/store.go b/go/store/nbs/store.go index 678c12380e..b9346a163f 100644 --- a/go/store/nbs/store.go +++ b/go/store/nbs/store.go @@ -1339,7 +1339,6 @@ func (nbs *NomsBlockStore) WriteTableFile(ctx context.Context, fileId string, nu return errors.New("Not implemented") } - tn, err := func() (n string, err error) { var r io.ReadCloser r, _, err = getRd() @@ -1366,12 +1365,12 @@ func (nbs *NomsBlockStore) WriteTableFile(ctx context.Context, fileId string, nu } }() - _, err = io.Copy(temp, r) - if err != nil { - return "", err - } + _, err = io.Copy(temp, r) + if err != nil { + return "", err + } - return temp.Name(), nil + return temp.Name(), nil }() if err != nil { return err