Format with gofumpt
Improve overall formatting by running `gofumpt -w .`
Change-Id: I53da7e8c42b518c0719216ac20a0c176cd9addd5
diff --git a/build/builder.go b/build/builder.go
index d1fc5f3..d6f3edc 100644
--- a/build/builder.go
+++ b/build/builder.go
@@ -529,16 +529,16 @@
func (b *Builder) writeShard(fn string, ib *zoekt.IndexBuilder) (*finishedShard, error) {
dir := filepath.Dir(fn)
- if err := os.MkdirAll(dir, 0700); err != nil {
+ if err := os.MkdirAll(dir, 0o700); err != nil {
return nil, err
}
- f, err := ioutil.TempFile(dir, filepath.Base(fn) + ".*.tmp")
+ f, err := ioutil.TempFile(dir, filepath.Base(fn)+".*.tmp")
if err != nil {
return nil, err
}
if runtime.GOOS != "windows" {
- if err := f.Chmod(0666 &^ umask); err != nil {
+ if err := f.Chmod(0o666 &^ umask); err != nil {
return nil, err
}
}
diff --git a/build/ctags.go b/build/ctags.go
index daa6c96..9c2ac5b 100644
--- a/build/ctags.go
+++ b/build/ctags.go
@@ -51,10 +51,10 @@
}
full := filepath.Join(dir, n)
- if err := os.MkdirAll(filepath.Dir(full), 0700); err != nil {
+ if err := os.MkdirAll(filepath.Dir(full), 0o700); err != nil {
return nil, err
}
- err := ioutil.WriteFile(full, c, 0600)
+ err := ioutil.WriteFile(full, c, 0o600)
if err != nil {
return nil, err
}
diff --git a/build/ctags_test.go b/build/ctags_test.go
index b674819..c853b2e 100644
--- a/build/ctags_test.go
+++ b/build/ctags_test.go
@@ -30,7 +30,8 @@
{
Sym: "bar",
Line: 2,
- }}
+ },
+ }
secs, err := tagsToSections(c, tags)
if err != nil {
@@ -79,7 +80,8 @@
{
Sym: "bar",
Line: 2,
- }}
+ },
+ }
secs, err := tagsToSections(c, tags)
if err != nil {
diff --git a/build/e2e_test.go b/build/e2e_test.go
index ebfe053..d72cda4 100644
--- a/build/e2e_test.go
+++ b/build/e2e_test.go
@@ -277,7 +277,7 @@
if fi, err := os.Lstat(fs[0]); err != nil {
t.Fatalf("Lstat: %v", err)
- } else if fi.Mode()&0666 == 0600 {
+ } else if fi.Mode()&0o666 == 0o600 {
// This fails spuriously if your umask is very restrictive.
t.Errorf("got mode %o, should respect umask.", fi.Mode())
}
@@ -348,13 +348,13 @@
b.AddFile(nm, []byte(strings.Repeat("01234567\n", 128)))
if i == 1 {
// force writes to fail.
- if err := os.Chmod(dir, 0555); err != nil {
+ if err := os.Chmod(dir, 0o555); err != nil {
t.Fatalf("chmod(%s): %s", dir, err)
}
}
}
- if err := os.Chmod(dir, 0755); err != nil {
+ if err := os.Chmod(dir, 0o755); err != nil {
t.Fatalf("chmod(%s, writable): %s", dir, err)
}
@@ -408,7 +408,8 @@
{
Name: "short",
Content: []byte("bla"),
- }},
+ },
+ },
want: []int{1, 0},
}, {
name: "test",
diff --git a/cmd/zoekt-archive-index/e2e_test.go b/cmd/zoekt-archive-index/e2e_test.go
index c4e16a2..daaf556 100644
--- a/cmd/zoekt-archive-index/e2e_test.go
+++ b/cmd/zoekt-archive-index/e2e_test.go
@@ -65,7 +65,7 @@
for name, body := range files {
hdr := &tar.Header{
Name: name,
- Mode: 0600,
+ Mode: 0o600,
Size: int64(len(body)),
}
if err := tw.WriteHeader(hdr); err != nil {
diff --git a/cmd/zoekt-git-clone/main.go b/cmd/zoekt-git-clone/main.go
index c41d8e6..eb85488 100644
--- a/cmd/zoekt-git-clone/main.go
+++ b/cmd/zoekt-git-clone/main.go
@@ -49,7 +49,7 @@
name = strings.TrimSuffix(name, ".git")
destDir := filepath.Dir(filepath.Join(*dest, name))
- if err := os.MkdirAll(destDir, 0755); err != nil {
+ if err := os.MkdirAll(destDir, 0o755); err != nil {
log.Fatal(err)
}
diff --git a/cmd/zoekt-index/main.go b/cmd/zoekt-index/main.go
index becd59f..a103f21 100644
--- a/cmd/zoekt-index/main.go
+++ b/cmd/zoekt-index/main.go
@@ -60,7 +60,7 @@
}
func main() {
- var cpuProfile = flag.String("cpu_profile", "", "write cpu profile to file")
+ cpuProfile := flag.String("cpu_profile", "", "write cpu profile to file")
ignoreDirs := flag.String("ignore_dirs", ".git,.hg,.svn", "comma separated list of directories to ignore.")
flag.Parse()
diff --git a/cmd/zoekt-indexserver/main.go b/cmd/zoekt-indexserver/main.go
index ae9659f..8392bb8 100644
--- a/cmd/zoekt-indexserver/main.go
+++ b/cmd/zoekt-indexserver/main.go
@@ -157,7 +157,7 @@
if failures, err := filepath.Glob(filepath.Join(indexDir, "*.tmp")); err != nil {
log.Printf("Glob: %v", err)
} else {
- for _, f := range failures {
+ for _, f := range failures {
os.Remove(f)
}
}
@@ -279,7 +279,7 @@
continue
}
- if err := os.MkdirAll(s, 0755); err != nil {
+ if err := os.MkdirAll(s, 0o755); err != nil {
log.Fatalf("MkdirAll %s: %v", s, err)
}
}
diff --git a/cmd/zoekt-mirror-bitbucket-server/main.go b/cmd/zoekt-mirror-bitbucket-server/main.go
index 17e57ce..9cfb204 100644
--- a/cmd/zoekt-mirror-bitbucket-server/main.go
+++ b/cmd/zoekt-mirror-bitbucket-server/main.go
@@ -65,7 +65,7 @@
}
destDir := filepath.Join(*dest, rootURL.Host)
- if err := os.MkdirAll(destDir, 0755); err != nil {
+ if err := os.MkdirAll(destDir, 0o755); err != nil {
log.Fatal(err)
}
@@ -173,9 +173,7 @@
func IsValidProjectType(projectType string) bool {
switch projectType {
- case
- "NORMAL",
- "PERSONAL":
+ case "NORMAL", "PERSONAL":
return true
}
return false
@@ -190,13 +188,11 @@
for {
resp, err := client.DefaultApi.GetRepositories_19(opts)
-
if err != nil {
return nil, err
}
repos, err := bitbucketv1.GetRepositoriesResponse(resp)
-
if err != nil {
return nil, err
}
diff --git a/cmd/zoekt-mirror-github/main.go b/cmd/zoekt-mirror-github/main.go
index ba1a0b8..1b0d8f8 100644
--- a/cmd/zoekt-mirror-github/main.go
+++ b/cmd/zoekt-mirror-github/main.go
@@ -102,7 +102,7 @@
client = github.NewClient(nil)
}
destDir := filepath.Join(*dest, host)
- if err := os.MkdirAll(destDir, 0755); err != nil {
+ if err := os.MkdirAll(destDir, 0o755); err != nil {
log.Fatal(err)
}
diff --git a/cmd/zoekt-mirror-gitiles/main.go b/cmd/zoekt-mirror-gitiles/main.go
index bb5b578..c4210a9 100644
--- a/cmd/zoekt-mirror-gitiles/main.go
+++ b/cmd/zoekt-mirror-gitiles/main.go
@@ -65,7 +65,7 @@
log.Fatal("must set --dest")
}
- if err := os.MkdirAll(filepath.Join(*dest, rootURL.Host, rootURL.Path), 0755); err != nil {
+ if err := os.MkdirAll(filepath.Join(*dest, rootURL.Host, rootURL.Path), 0o755); err != nil {
log.Fatal(err)
}
diff --git a/cmd/zoekt-mirror-gitlab/main.go b/cmd/zoekt-mirror-gitlab/main.go
index 7f1fa40..e119e87 100644
--- a/cmd/zoekt-mirror-gitlab/main.go
+++ b/cmd/zoekt-mirror-gitlab/main.go
@@ -64,7 +64,7 @@
host = rootURL.Host
destDir := filepath.Join(*dest, host)
- if err := os.MkdirAll(destDir, 0755); err != nil {
+ if err := os.MkdirAll(destDir, 0o755); err != nil {
log.Fatal(err)
}
@@ -91,7 +91,6 @@
var gitlabProjects []*gitlab.Project
for {
projects, resp, err := client.Projects.ListProjects(opt)
-
if err != nil {
log.Fatal(err)
}
@@ -139,7 +138,6 @@
}
func deleteStaleProjects(destDir string, filter *gitindex.Filter, projects []*gitlab.Project) error {
-
u, err := url.Parse(projects[0].HTTPURLToRepo)
u.Path = ""
if err != nil {
@@ -163,7 +161,6 @@
}
func fetchProjects(destDir, token string, projects []*gitlab.Project) {
-
for _, p := range projects {
u, err := url.Parse(p.HTTPURLToRepo)
if err != nil {
diff --git a/cmd/zoekt-repo-index/main.go b/cmd/zoekt-repo-index/main.go
index 5d158ec..06e8e20 100644
--- a/cmd/zoekt-repo-index/main.go
+++ b/cmd/zoekt-repo-index/main.go
@@ -120,9 +120,9 @@
}
func main() {
- var sizeMax = flag.Int("file_limit", 128<<10, "maximum file size")
- var shardLimit = flag.Int("shard_limit", 100<<20, "maximum corpus size for a shard")
- var parallelism = flag.Int("parallelism", 1, "maximum number of parallel indexing processes")
+ sizeMax := flag.Int("file_limit", 128<<10, "maximum file size")
+ shardLimit := flag.Int("shard_limit", 100<<20, "maximum corpus size for a shard")
+ parallelism := flag.Int("parallelism", 1, "maximum number of parallel indexing processes")
revPrefix := flag.String("rev_prefix", "refs/remotes/origin/", "prefix for references")
baseURLStr := flag.String("base_url", "", "base url to interpret repository names")
diff --git a/cmd/zoekt-webserver/main.go b/cmd/zoekt-webserver/main.go
index 960231a..0cb4771 100644
--- a/cmd/zoekt-webserver/main.go
+++ b/cmd/zoekt-webserver/main.go
@@ -94,7 +94,7 @@
for k, v := range web.TemplateText {
nm := filepath.Join(dir, k+templateExtension)
- if err := ioutil.WriteFile(nm, []byte(v), 0644); err != nil {
+ if err := ioutil.WriteFile(nm, []byte(v), 0o644); err != nil {
return err
}
}
@@ -146,7 +146,7 @@
// Tune GOMAXPROCS to match Linux container CPU quota.
maxprocs.Set()
- if err := os.MkdirAll(*index, 0755); err != nil {
+ if err := os.MkdirAll(*index, 0o755); err != nil {
log.Fatal(err)
}
diff --git a/ctags/parse_test.go b/ctags/parse_test.go
index 0545747..30f41a1 100644
--- a/ctags/parse_test.go
+++ b/ctags/parse_test.go
@@ -25,7 +25,8 @@
out *Entry
}
cases := []testcase{
- {`ABBREV_SHA ./gitiles-servlet/src/main/java/com/google/gitiles/CommitData.java 59;" e enum:CommitData.Field file:`,
+ {
+ `ABBREV_SHA ./gitiles-servlet/src/main/java/com/google/gitiles/CommitData.java 59;" e enum:CommitData.Field file:`,
&Entry{
Sym: "ABBREV_SHA",
Path: "./gitiles-servlet/src/main/java/com/google/gitiles/CommitData.java",
@@ -36,7 +37,8 @@
FileLimited: true,
},
},
- {`ACCESS_ATTRIBUTE ./gitiles-servlet/src/main/java/com/google/gitiles/CommitData.java 55;" f class:BaseServlet file:`,
+ {
+ `ACCESS_ATTRIBUTE ./gitiles-servlet/src/main/java/com/google/gitiles/CommitData.java 55;" f class:BaseServlet file:`,
&Entry{
Sym: "ACCESS_ATTRIBUTE",
Path: "./gitiles-servlet/src/main/java/com/google/gitiles/CommitData.java",
@@ -51,7 +53,6 @@
for _, c := range cases {
e, err := Parse(c.in)
if err != nil && c.out != nil {
-
t.Errorf("Parse(%s): %v", c.in, err)
} else if !reflect.DeepEqual(c.out, e) {
t.Errorf("Parse(%s): got %#v, want %#v", c.in, e, c.out)
diff --git a/eval.go b/eval.go
index 37108c0..bd3d0a8 100644
--- a/eval.go
+++ b/eval.go
@@ -229,7 +229,6 @@
for i := range fileMatch.LineMatches {
if maxFileScore < fileMatch.LineMatches[i].Score {
maxFileScore = fileMatch.LineMatches[i].Score
-
}
// Order by ordering in file.
diff --git a/eval_test.go b/eval_test.go
index 105e1a3..955e575 100644
--- a/eval_test.go
+++ b/eval_test.go
@@ -78,11 +78,13 @@
substrMT("baz"),
substrMT("bla"),
}}, false},
- {"^[a-z](People)+barrabas$",
+ {
+ "^[a-z](People)+barrabas$",
&andMatchTree{[]matchTree{
substrMT("People"),
substrMT("barrabas"),
- }}, false},
+ }}, false,
+ },
{"foo", substrMT("foo"), true},
{"^foo", substrMT("foo"), false},
{"(foo) (bar)", &andMatchTree{[]matchTree{substrMT("foo"), substrMT("bar")}}, false},
diff --git a/gitindex/clone.go b/gitindex/clone.go
index fb819c2..11b2c87 100644
--- a/gitindex/clone.go
+++ b/gitindex/clone.go
@@ -32,7 +32,7 @@
// the directory of the repository.
func CloneRepo(destDir, name, cloneURL string, settings map[string]string) (string, error) {
parent := filepath.Join(destDir, filepath.Dir(name))
- if err := os.MkdirAll(parent, 0755); err != nil {
+ if err := os.MkdirAll(parent, 0o755); err != nil {
return "", err
}
diff --git a/gitindex/delete_test.go b/gitindex/delete_test.go
index f7c6ee3..381e6e0 100644
--- a/gitindex/delete_test.go
+++ b/gitindex/delete_test.go
@@ -77,7 +77,8 @@
"gerrit.googlesource.com/bdir.git": {},
"adir/.git": {},
"bdir/.git": {},
- "gerrit.googlesource.com/adir.git": {}}
+ "gerrit.googlesource.com/adir.git": {},
+ }
if !reflect.DeepEqual(gotAfter, wantAfter) {
t.Errorf("got %v want %v", gotAfter, wantAfter)
diff --git a/gitindex/submodule_test.go b/gitindex/submodule_test.go
index f351bc0..ca7fef3 100644
--- a/gitindex/submodule_test.go
+++ b/gitindex/submodule_test.go
@@ -31,7 +31,7 @@
}
want := map[string]*SubmoduleEntry{
- "plugins/abc": &SubmoduleEntry{
+ "plugins/abc": {
Path: "plugins/abc",
URL: "../plugins/abc",
Branch: ".",
diff --git a/gitindex/tree_test.go b/gitindex/tree_test.go
index 9314aba..3b1ed14 100644
--- a/gitindex/tree_test.go
+++ b/gitindex/tree_test.go
@@ -34,7 +34,7 @@
)
func createSubmoduleRepo(dir string) error {
- if err := os.MkdirAll(dir, 0755); err != nil {
+ if err := os.MkdirAll(dir, 0o755); err != nil {
return err
}
script := `mkdir adir bdir
@@ -295,7 +295,7 @@
}
func createMultibranchRepo(dir string) error {
- if err := os.MkdirAll(dir, 0755); err != nil {
+ if err := os.MkdirAll(dir, 0o755); err != nil {
return err
}
script := `mkdir repo
diff --git a/index_test.go b/index_test.go
index c8f987f..0f84197 100644
--- a/index_test.go
+++ b/index_test.go
@@ -169,7 +169,8 @@
LineEnd: 11,
LineNumber: 2,
},
- }}}
+ },
+ }}
if !reflect.DeepEqual(matches, want) {
t.Errorf("got %v, want %v", matches, want)
@@ -689,7 +690,8 @@
for i := 0; i < limit; i++ {
s := fmt.Sprintf("b%d", i)
r.Branches = append(r.Branches, RepositoryBranch{
- s, "v-" + s})
+ s, "v-" + s,
+ })
}
_, err := NewIndexBuilder(r)
if limit == 64 && err != nil {
@@ -757,7 +759,8 @@
b := testIndexBuilder(t, nil,
Document{
Name: "f1",
- Content: content})
+ Content: content,
+ })
// ------------------------------01234567890123
sres := searchForTest(t, b,
@@ -894,7 +897,8 @@
content := []byte("bla\nfunc unmarshalGitiles\n")
b := testIndexBuilder(t, nil, Document{
Name: "f1",
- Content: content})
+ Content: content,
+ })
res := searchForTest(t, b,
&query.Regexp{
@@ -1224,10 +1228,11 @@
func TestSubRepo(t *testing.T) {
subRepos := map[string]*Repository{
- "sub": &Repository{
+ "sub": {
Name: "sub-name",
LineFragmentTemplate: "sub-line",
- }}
+ },
+ }
content := []byte("pqr\nalex")
// ----------------0123 4567
@@ -1480,7 +1485,8 @@
Content: []byte(
`hello
start of middle of line
-`)})
+`),
+ })
q, err := query.Parse("^start")
if err != nil {
diff --git a/indexdata.go b/indexdata.go
index 7072951..4262116 100644
--- a/indexdata.go
+++ b/indexdata.go
@@ -241,7 +241,6 @@
if firstI != lastI {
i, err := d.newDistanceTrigramIter(firstNG, lastNG, lastI-firstI, query.CaseSensitive, query.FileName)
-
if err != nil {
return nil, err
}
diff --git a/matchtree.go b/matchtree.go
index 0bb80cf..4c04779 100644
--- a/matchtree.go
+++ b/matchtree.go
@@ -36,13 +36,17 @@
prepare(nextDoc uint32)
}
-const costConst = 0
-const costMemory = 1
-const costContent = 2
-const costRegexp = 3
+const (
+ costConst = 0
+ costMemory = 1
+ costContent = 2
+ costRegexp = 3
+)
-const costMin = costConst
-const costMax = costRegexp
+const (
+ costMin = costConst
+ costMax = costRegexp
+)
// An expression tree coupled with matches. The matchtree has two
// functions:
diff --git a/query/query_test.go b/query/query_test.go
index f6cc4ac..0d85b29 100644
--- a/query/query_test.go
+++ b/query/query_test.go
@@ -27,7 +27,8 @@
&And{[]Q{
&Substring{Pattern: "hoi"},
&Not{&Substring{Pattern: "hai"}},
- }}}}
+ }},
+ }}
got := q.String()
want := `(or (and substr:"hoi" (not substr:"hai")))`
diff --git a/read.go b/read.go
index cb96b85..f8d07ab 100644
--- a/read.go
+++ b/read.go
@@ -311,7 +311,8 @@
// section.
return d.readSectionBlob(simpleSection{
off: d.boundariesStart + off,
- sz: sz})
+ sz: sz,
+ })
}
func (d *indexData) readNewlines(i uint32, buf []uint32) ([]uint32, uint32, error) {
diff --git a/shards/shards_test.go b/shards/shards_test.go
index bb1a50c..3df2025 100644
--- a/shards/shards_test.go
+++ b/shards/shards_test.go
@@ -52,7 +52,7 @@
defer log.SetOutput(os.Stderr)
ss := newShardedSearcher(2)
ss.shards = map[string]rankedShard{
- "x": rankedShard{Searcher: &crashSearcher{}},
+ "x": {Searcher: &crashSearcher{}},
}
q := &query.Substring{Pattern: "hoi"}
diff --git a/shards/watcher_test.go b/shards/watcher_test.go
index 4db7275..1b16617 100644
--- a/shards/watcher_test.go
+++ b/shards/watcher_test.go
@@ -57,7 +57,7 @@
}
shard := filepath.Join(dir, "foo.zoekt")
- if err := ioutil.WriteFile(shard, []byte("hello"), 0644); err != nil {
+ if err := ioutil.WriteFile(shard, []byte("hello"), 0o644); err != nil {
t.Fatalf("WriteFile: %v", err)
}
@@ -73,7 +73,7 @@
// Must sleep because of FS timestamp resolution.
advanceFS()
- if err := ioutil.WriteFile(shard, []byte("changed"), 0644); err != nil {
+ if err := ioutil.WriteFile(shard, []byte("changed"), 0o644); err != nil {
t.Fatalf("WriteFile: %v", err)
}
@@ -91,7 +91,7 @@
}
advanceFS()
- if err := ioutil.WriteFile(shard+".bla", []byte("changed"), 0644); err != nil {
+ if err := ioutil.WriteFile(shard+".bla", []byte("changed"), 0o644); err != nil {
t.Fatalf("WriteFile: %v", err)
}
diff --git a/web/e2e_test.go b/web/e2e_test.go
index 8506768..dc8531f 100644
--- a/web/e2e_test.go
+++ b/web/e2e_test.go
@@ -44,6 +44,7 @@
func (s *memSeeker) Size() (uint32, error) {
return uint32(len(s.data)), nil
}
+
func (s *memSeeker) Name() string {
return "memSeeker"
}
@@ -100,19 +101,19 @@
nowStr := time.Now().Format("Jan 02, 2006 15:04")
for req, needles := range map[string][]string{
- "/": []string{"from 1 repositories"},
- "/search?q=water": []string{
+ "/": {"from 1 repositories"},
+ "/search?q=water": {
"href=\"file-url#line",
"carry <b>water</b>",
},
- "/search?q=r:": []string{
+ "/search?q=r:": {
"1234\">master",
"Found 1 repositories",
nowStr,
"repo-url\">name",
"1 files (36)",
},
- "/search?q=magic": []string{
+ "/search?q=magic": {
`value=magic`,
},
} {
@@ -165,7 +166,7 @@
defer ts.Close()
for req, needles := range map[string][]string{
- "/print?q=bla&r=name&f=f2": []string{
+ "/print?q=bla&r=name&f=f2": {
`pre id="l1" class="inline-pre"><span class="noselect"><a href="#l1">`,
},
} {
@@ -205,7 +206,7 @@
defer ts.Close()
for req, needles := range map[string][]string{
- "/search?q=water": []string{
+ "/search?q=water": {
`href="print?`,
},
} {
