From 56186a3433132cd27936eb30707caac63b15d4e9 Mon Sep 17 00:00:00 2001 From: zachmu Date: Fri, 19 Aug 2022 00:21:30 +0000 Subject: [PATCH] [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh --- go/go.mod | 1 - go/go.sum | 2 -- go/store/cmd/noms/noms_show.go | 2 +- go/store/cmd/noms/noms_sync_test.go | 4 ++-- go/store/datas/dataset.go | 4 +++- go/store/spec/spec.go | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/go/go.mod b/go/go.mod index cd53a494a4..db80b5c077 100644 --- a/go/go.mod +++ b/go/go.mod @@ -31,7 +31,6 @@ require ( github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d github.com/mattn/go-isatty v0.0.14 github.com/mattn/go-runewidth v0.0.9 - github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b github.com/pkg/errors v0.9.1 github.com/pkg/profile v1.5.0 github.com/rivo/uniseg v0.1.0 diff --git a/go/go.sum b/go/go.sum index 91b22a5849..79642e0959 100644 --- a/go/go.sum +++ b/go/go.sum @@ -513,8 +513,6 @@ github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= diff --git a/go/store/cmd/noms/noms_show.go b/go/store/cmd/noms/noms_show.go index af68ab0f4a..723cef5431 100644 --- a/go/store/cmd/noms/noms_show.go +++ b/go/store/cmd/noms/noms_show.go @@ -225,4 +225,4 @@ func locationFromTimezoneArg(tz string, defaultTZ *time.Location) (*time.Locatio default: return nil, errors.New("value must be: local or utc") } -} \ No newline at end of file +} diff --git a/go/store/cmd/noms/noms_sync_test.go b/go/store/cmd/noms/noms_sync_test.go index 53f2132de0..1e3ddd41d9 100644 --- a/go/store/cmd/noms/noms_sync_test.go +++ b/go/store/cmd/noms/noms_sync_test.go @@ -25,12 +25,12 @@ import ( "context" "testing" - "github.com/dolthub/dolt/go/store/d" - "github.com/dolthub/dolt/go/store/hash" "github.com/stretchr/testify/suite" "github.com/dolthub/dolt/go/libraries/utils/file" + "github.com/dolthub/dolt/go/store/d" "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/hash" "github.com/dolthub/dolt/go/store/nbs" "github.com/dolthub/dolt/go/store/spec" "github.com/dolthub/dolt/go/store/types" diff --git a/go/store/datas/dataset.go b/go/store/datas/dataset.go index aea5123dfd..d8953003b2 100644 --- a/go/store/datas/dataset.go +++ b/go/store/datas/dataset.go @@ -34,6 +34,7 @@ import ( ) type refnameAction byte + const ( refnameOk refnameAction = 0 refnameEof refnameAction = 1 @@ -82,7 +83,8 @@ func ValidateDatasetId(refname string) error { // 2: ., look for a preceding . to reject .. in refs // 3: {, look for a preceding @ to reject @{ in refs // 4: A bad character: ASCII control characters, and -// ":", "?", "[", "\", "^", "~", SP, or TAB +// +// ":", "?", "[", "\", "^", "~", SP, or TAB var refnameActions = [256]refnameAction{ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, diff --git a/go/store/spec/spec.go b/go/store/spec/spec.go index c7985025b8..d3667e89f8 100644 --- a/go/store/spec/spec.go +++ b/go/store/spec/spec.go @@ -221,7 +221,7 @@ func ForDatasetOpts(spec string, opts SpecOptions) (Spec, error) { if path.Dataset == "" { return Spec{}, errors.New("dataset name required for dataset spec") } - + sp.Path = path return sp, nil }