Merge pull request #667 from ferhatelmas/simplify

mcuadros · web-flow · commit 7ced03216a47 · 2017-11-29T18:01:24.000+01:00
all: simplification
diff --git a/blame.go b/blame.go
@@ -147,10 +147,7 @@ func (b *blame) fillRevs() error {
 	var err error
 
 	b.revs, err = references(b.fRev, b.path)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // build graph of a file from its revision history
@@ -244,7 +241,7 @@ func (b *blame) GoString() string {
 
 	lines := strings.Split(contents, "\n")
 	// max line number length
-	mlnl := len(fmt.Sprintf("%s", strconv.Itoa(len(lines))))
+	mlnl := len(strconv.Itoa(len(lines)))
 	// max author length
 	mal := b.maxAuthorLength()
 	format := fmt.Sprintf("%%s (%%-%ds %%%dd) %%s\n",
diff --git a/common_test.go b/common_test.go
@@ -30,7 +30,7 @@ func (s *BaseSuite) SetUpSuite(c *C) {
 	s.Suite.SetUpSuite(c)
 	s.buildBasicRepository(c)
 
-	s.cache = make(map[string]*Repository, 0)
+	s.cache = make(map[string]*Repository)
 }
 
 func (s *BaseSuite) TearDownSuite(c *C) {
diff --git a/config/config.go b/config/config.go
@@ -65,8 +65,8 @@ type Config struct {
 // NewConfig returns a new empty Config.
 func NewConfig() *Config {
 	return &Config{
-		Remotes:    make(map[string]*RemoteConfig, 0),
-		Submodules: make(map[string]*Submodule, 0),
+		Remotes:    make(map[string]*RemoteConfig),
+		Submodules: make(map[string]*Submodule),
 		Raw:        format.New(),
 	}
 }
@@ -290,13 +290,8 @@ func (c *RemoteConfig) unmarshal(s *format.Subsection) error {
 		fetch = append(fetch, rs)
 	}
 
-	var urls []string
-	for _, f := range c.raw.Options.GetAll(urlKey) {
-		urls = append(urls, f)
-	}
-
 	c.Name = c.raw.Name
-	c.URLs = urls
+	c.URLs = append([]string(nil), c.raw.Options.GetAll(urlKey)...)
 	c.Fetch = fetch
 
 	return nil
diff --git a/config/modules.go b/config/modules.go
@@ -24,7 +24,7 @@ type Modules struct {
 // NewModules returns a new empty Modules
 func NewModules() *Modules {
 	return &Modules{
-		Submodules: make(map[string]*Submodule, 0),
+		Submodules: make(map[string]*Submodule),
 		raw:        format.New(),
 	}
 }
diff --git a/config/refspec.go b/config/refspec.go
@@ -51,20 +51,12 @@ func (s RefSpec) Validate() error {
 
 // IsForceUpdate returns if update is allowed in non fast-forward merges.
 func (s RefSpec) IsForceUpdate() bool {
-	if s[0] == refSpecForce[0] {
-		return true
-	}
-
-	return false
+	return s[0] == refSpecForce[0]
 }
 
 // IsDelete returns true if the refspec indicates a delete (empty src).
 func (s RefSpec) IsDelete() bool {
-	if s[0] == refSpecSeparator[0] {
-		return true
-	}
-
-	return false
+	return s[0] == refSpecSeparator[0]
 }
 
 // Src return the src side.
@@ -87,7 +79,7 @@ func (s RefSpec) Match(n plumbing.ReferenceName) bool {
 
 // IsWildcard returns true if the RefSpec contains a wildcard.
 func (s RefSpec) IsWildcard() bool {
-	return strings.Index(string(s), refSpecWildcard) != -1
+	return strings.Contains(string(s), refSpecWildcard)
 }
 
 func (s RefSpec) matchExact(n plumbing.ReferenceName) bool {
diff --git a/plumbing/format/config/encoder.go b/plumbing/format/config/encoder.go
@@ -53,17 +53,13 @@ func (e *Encoder) encodeSubsection(sectionName string, s *Subsection) error {
 		return err
 	}
 
-	if err := e.encodeOptions(s.Options); err != nil {
-		return err
-	}
-
-	return nil
+	return e.encodeOptions(s.Options)
 }
 
 func (e *Encoder) encodeOptions(opts Options) error {
 	for _, o := range opts {
 		pattern := "\t%s = %s\n"
-		if strings.Index(o.Value, "\\") != -1 {
+		if strings.Contains(o.Value, "\\") {
 			pattern = "\t%s = %q\n"
 		}
 
diff --git a/plumbing/format/index/decoder.go b/plumbing/format/index/decoder.go
@@ -200,11 +200,8 @@ func (d *Decoder) padEntry(idx *Index, e *Entry, read int) error {
 
 	entrySize := read + len(e.Name)
 	padLen := 8 - entrySize%8
-	if _, err := io.CopyN(ioutil.Discard, d.r, int64(padLen)); err != nil {
-		return err
-	}
-
-	return nil
+	_, err := io.CopyN(ioutil.Discard, d.r, int64(padLen))
+	return err
 }
 
 func (d *Decoder) readExtensions(idx *Index) error {
@@ -288,7 +285,7 @@ func (d *Decoder) readChecksum(expected []byte, alreadyRead [4]byte) error {
 		return err
 	}
 
-	if bytes.Compare(h[:], expected) != 0 {
+	if !bytes.Equal(h[:], expected) {
 		return ErrInvalidChecksum
 	}
 
@@ -407,7 +404,7 @@ func (d *resolveUndoDecoder) Decode(ru *ResolveUndo) error {
 
 func (d *resolveUndoDecoder) readEntry() (*ResolveUndoEntry, error) {
 	e := &ResolveUndoEntry{
-		Stages: make(map[Stage]plumbing.Hash, 0),
+		Stages: make(map[Stage]plumbing.Hash),
 	}
 
 	path, err := binary.ReadUntil(d.r, '\x00')
diff --git a/plumbing/format/objfile/reader.go b/plumbing/format/objfile/reader.go
@@ -110,9 +110,5 @@ func (r *Reader) Hash() plumbing.Hash {
 // Close releases any resources consumed by the Reader. Calling Close does not
 // close the wrapped io.Reader originally passed to NewReader.
 func (r *Reader) Close() error {
-	if err := r.zlib.Close(); err != nil {
-		return err
-	}
-
-	return nil
+	return r.zlib.Close()
 }
diff --git a/plumbing/format/packfile/decoder.go b/plumbing/format/packfile/decoder.go
@@ -105,7 +105,7 @@ func NewDecoderForType(s *Scanner, o storer.EncodedObjectStorer,
 		o: o,
 
 		idx:          NewIndex(0),
-		offsetToType: make(map[int64]plumbing.ObjectType, 0),
+		offsetToType: make(map[int64]plumbing.ObjectType),
 		decoderType:  t,
 	}, nil
 }
diff --git a/plumbing/format/packfile/delta_index.go b/plumbing/format/packfile/delta_index.go
@@ -215,12 +215,10 @@ var len8tab = [256]uint8{
 }
 
 func hashBlock(raw []byte, ptr int) int {
-	var hash uint32
-
 	// The first 4 steps collapse out into a 4 byte big-endian decode,
 	// with a larger right shift as we combined shift lefts together.
 	//
-	hash = ((uint32(raw[ptr]) & 0xff) << 24) |
+	hash := ((uint32(raw[ptr]) & 0xff) << 24) |
 		((uint32(raw[ptr+1]) & 0xff) << 16) |
 		((uint32(raw[ptr+2]) & 0xff) << 8) |
 		(uint32(raw[ptr+3]) & 0xff)
diff --git a/plumbing/format/packfile/object_pack.go b/plumbing/format/packfile/object_pack.go
@@ -84,11 +84,7 @@ func (o *ObjectToPack) Size() int64 {
 }
 
 func (o *ObjectToPack) IsDelta() bool {
-	if o.Base != nil {
-		return true
-	}
-
-	return false
+	return o.Base != nil
 }
 
 func (o *ObjectToPack) SetDelta(base *ObjectToPack, delta plumbing.EncodedObject) {
diff --git a/plumbing/format/packfile/patch_delta.go b/plumbing/format/packfile/patch_delta.go
@@ -38,11 +38,8 @@ func ApplyDelta(target, base plumbing.EncodedObject, delta []byte) error {
 
 	target.SetSize(int64(len(dst)))
 
-	if _, err := w.Write(dst); err != nil {
-		return err
-	}
-
-	return nil
+	_, err = w.Write(dst)
+	return err
 }
 
 var (
diff --git a/plumbing/format/pktline/encoder.go b/plumbing/format/pktline/encoder.go
@@ -63,21 +63,15 @@ func (e *Encoder) encodeLine(p []byte) error {
 	}
 
 	if bytes.Equal(p, Flush) {
-		if err := e.Flush(); err != nil {
-			return err
-		}
-		return nil
+		return e.Flush()
 	}
 
 	n := len(p) + 4
 	if _, err := e.w.Write(asciiHex16(n)); err != nil {
 		return err
 	}
-	if _, err := e.w.Write(p); err != nil {
-		return err
-	}
-
-	return nil
+	_, err := e.w.Write(p)
+	return err
 }
 
 // Returns the hexadecimal ascii representation of the 16 less
diff --git a/plumbing/protocol/packp/advrefs_encode.go b/plumbing/protocol/packp/advrefs_encode.go
@@ -133,7 +133,7 @@ func encodeRefs(e *advRefsEncoder) encoderStateFn {
 			continue
 		}
 
-		hash, _ := e.data.References[r]
+		hash := e.data.References[r]
 		if e.err = e.pe.Encodef("%s %s\n", hash.String(), r); e.err != nil {
 			return nil
 		}
diff --git a/plumbing/protocol/packp/shallowupd.go b/plumbing/protocol/packp/shallowupd.go
@@ -32,7 +32,7 @@ func (r *ShallowUpdate) Decode(reader io.Reader) error {
 			err = r.decodeShallowLine(line)
 		case bytes.HasPrefix(line, unshallow):
 			err = r.decodeUnshallowLine(line)
-		case bytes.Compare(line, pktline.Flush) == 0:
+		case bytes.Equal(line, pktline.Flush):
 			return nil
 		}
 
diff --git a/plumbing/protocol/packp/srvresp.go b/plumbing/protocol/packp/srvresp.go
@@ -77,7 +77,7 @@ func (r *ServerResponse) stopReading(reader *bufio.Reader) (bool, error) {
 func (r *ServerResponse) isValidCommand(b []byte) bool {
 	commands := [][]byte{ack, nak}
 	for _, c := range commands {
-		if bytes.Compare(b, c) == 0 {
+		if bytes.Equal(b, c) {
 			return true
 		}
 	}
@@ -90,11 +90,11 @@ func (r *ServerResponse) decodeLine(line []byte) error {
 		return fmt.Errorf("unexpected flush")
 	}
 
-	if bytes.Compare(line[0:3], ack) == 0 {
+	if bytes.Equal(line[0:3], ack) {
 		return r.decodeACKLine(line)
 	}
 
-	if bytes.Compare(line[0:3], nak) == 0 {
+	if bytes.Equal(line[0:3], nak) {
 		return nil
 	}
 
diff --git a/plumbing/protocol/packp/ulreq_encode.go b/plumbing/protocol/packp/ulreq_encode.go
@@ -70,7 +70,7 @@ func (e *ulReqEncoder) encodeFirstWant() stateFn {
 func (e *ulReqEncoder) encodeAditionalWants() stateFn {
 	last := e.data.Wants[0]
 	for _, w := range e.data.Wants[1:] {
-		if bytes.Compare(last[:], w[:]) == 0 {
+		if bytes.Equal(last[:], w[:]) {
 			continue
 		}
 
@@ -90,7 +90,7 @@ func (e *ulReqEncoder) encodeShallows() stateFn {
 
 	var last plumbing.Hash
 	for _, s := range e.data.Shallows {
-		if bytes.Compare(last[:], s[:]) == 0 {
+		if bytes.Equal(last[:], s[:]) {
 			continue
 		}
 
diff --git a/plumbing/protocol/packp/uppackreq.go b/plumbing/protocol/packp/uppackreq.go
@@ -77,7 +77,7 @@ func (u *UploadHaves) Encode(w io.Writer, flush bool) error {
 
 	var last plumbing.Hash
 	for _, have := range u.Haves {
-		if bytes.Compare(last[:], have[:]) == 0 {
+		if bytes.Equal(last[:], have[:]) {
 			continue
 		}
 
diff --git a/plumbing/protocol/packp/uppackresp_test.go b/plumbing/protocol/packp/uppackresp_test.go
@@ -92,7 +92,7 @@ func (s *UploadPackResponseSuite) TestEncodeNAK(c *C) {
 	c.Assert(res.Encode(b), IsNil)
 
 	expected := "0008NAK\n[PACK]"
-	c.Assert(string(b.Bytes()), Equals, expected)
+	c.Assert(b.String(), Equals, expected)
 }
 
 func (s *UploadPackResponseSuite) TestEncodeDepth(c *C) {
@@ -107,7 +107,7 @@ func (s *UploadPackResponseSuite) TestEncodeDepth(c *C) {
 	c.Assert(res.Encode(b), IsNil)
 
 	expected := "00000008NAK\nPACK"
-	c.Assert(string(b.Bytes()), Equals, expected)
+	c.Assert(b.String(), Equals, expected)
 }
 
 func (s *UploadPackResponseSuite) TestEncodeMultiACK(c *C) {
diff --git a/plumbing/storer/reference_test.go b/plumbing/storer/reference_test.go
@@ -97,11 +97,7 @@ func (s *ReferenceSuite) TestReferenceFilteredIterNext(c *C) {
 	}
 
 	i := NewReferenceFilteredIter(func(r *plumbing.Reference) bool {
-		if r.Name() == "bar" {
-			return true
-		}
-
-		return false
+		return r.Name() == "bar"
 	}, NewReferenceSliceIter(slice))
 	foo, err := i.Next()
 	c.Assert(err, IsNil)
@@ -120,11 +116,7 @@ func (s *ReferenceSuite) TestReferenceFilteredIterForEach(c *C) {
 	}
 
 	i := NewReferenceFilteredIter(func(r *plumbing.Reference) bool {
-		if r.Name() == "bar" {
-			return true
-		}
-
-		return false
+		return r.Name() == "bar"
 	}, NewReferenceSliceIter(slice))
 	var count int
 	i.ForEach(func(r *plumbing.Reference) error {
@@ -143,11 +135,7 @@ func (s *ReferenceSuite) TestReferenceFilteredIterError(c *C) {
 	}
 
 	i := NewReferenceFilteredIter(func(r *plumbing.Reference) bool {
-		if r.Name() == "bar" {
-			return true
-		}
-
-		return false
+		return r.Name() == "bar"
 	}, NewReferenceSliceIter(slice))
 	var count int
 	exampleErr := errors.New("SOME ERROR")
@@ -172,11 +160,7 @@ func (s *ReferenceSuite) TestReferenceFilteredIterForEachStop(c *C) {
 	}
 
 	i := NewReferenceFilteredIter(func(r *plumbing.Reference) bool {
-		if r.Name() == "bar" {
-			return true
-		}
-
-		return false
+		return r.Name() == "bar"
 	}, NewReferenceSliceIter(slice))
 
 	var count int
diff --git a/references.go b/references.go
@@ -26,7 +26,7 @@ import (
 // to fix this).
 func references(c *object.Commit, path string) ([]*object.Commit, error) {
 	var result []*object.Commit
-	seen := make(map[plumbing.Hash]struct{}, 0)
+	seen := make(map[plumbing.Hash]struct{})
 	if err := walkGraph(&result, &seen, c, path); err != nil {
 		return nil, err
 	}
diff --git a/remote.go b/remote.go
@@ -580,7 +580,7 @@ func getHaves(
 	}
 
 	for _, ref := range localRefs {
-		if haves[ref.Hash()] == true {
+		if haves[ref.Hash()] {
 			continue
 		}
 
@@ -618,7 +618,7 @@ func calculateRefs(
 		return nil, err
 	}
 
-	refs := make(memory.ReferenceStorage, 0)
+	refs := make(memory.ReferenceStorage)
 	return refs, iter.ForEach(func(ref *plumbing.Reference) error {
 		if !config.MatchAny(spec, ref.Name()) {
 			return nil
diff --git a/repository.go b/repository.go
diff --git a/storage/filesystem/internal/dotgit/dotgit.go b/storage/filesystem/internal/dotgit/dotgit.go
diff --git a/storage/filesystem/object.go b/storage/filesystem/object.go
diff --git a/storage/memory/storage.go b/storage/memory/storage.go
diff --git a/worktree_status.go b/worktree_status.go

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func (s BaseSuite) SetUpSuite(c C) {`
`30`	`30`	`s.Suite.SetUpSuite(c)`
`31`	`31`	`s.buildBasicRepository(c)`
`32`	`32`
`33`		`- s.cache = make(map[string]*Repository, 0)`
	`33`	`+ s.cache = make(map[string]*Repository)`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`func (s BaseSuite) TearDownSuite(c C) {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ type Modules struct {`
`24`	`24`	`// NewModules returns a new empty Modules`
`25`	`25`	`func NewModules() *Modules {`
`26`	`26`	`return &Modules{`
`27`		`- Submodules: make(map[string]*Submodule, 0),`
	`27`	`+ Submodules: make(map[string]*Submodule),`
`28`	`28`	`raw: format.New(),`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,17 +53,13 @@ func (e Encoder) encodeSubsection(sectionName string, s Subsection) error {`
`53`	`53`	`return err`
`54`	`54`	`}`
`55`	`55`
`56`		`- if err := e.encodeOptions(s.Options); err != nil {`
`57`		`- return err`
`58`		`- }`
`59`		`-`
`60`		`- return nil`
	`56`	`+ return e.encodeOptions(s.Options)`
`61`	`57`	`}`
`62`	`58`
`63`	`59`	`func (e *Encoder) encodeOptions(opts Options) error {`
`64`	`60`	`for _, o := range opts {`
`65`	`61`	`pattern := "\t%s = %s\n"`
`66`		`- if strings.Index(o.Value, "\\") != -1 {`
	`62`	`+ if strings.Contains(o.Value, "\\") {`
`67`	`63`	`pattern = "\t%s = %q\n"`
`68`	`64`	`}`
`69`	`65`
Original file line number	Diff line number	Diff line change
`@@ -200,11 +200,8 @@ func (d Decoder) padEntry(idx Index, e *Entry, read int) error {`
`200`	`200`
`201`	`201`	`entrySize := read + len(e.Name)`
`202`	`202`	`padLen := 8 - entrySize%8`
`203`		`- if _, err := io.CopyN(ioutil.Discard, d.r, int64(padLen)); err != nil {`
`204`		`- return err`
`205`		`- }`
`206`		`-`
`207`		`- return nil`
	`203`	`+ _, err := io.CopyN(ioutil.Discard, d.r, int64(padLen))`
	`204`	`+ return err`
`208`	`205`	`}`
`209`	`206`
`210`	`207`	`func (d Decoder) readExtensions(idx Index) error {`
`@@ -288,7 +285,7 @@ func (d *Decoder) readChecksum(expected []byte, alreadyRead [4]byte) error {`
`288`	`285`	`return err`
`289`	`286`	`}`
`290`	`287`
`291`		`- if bytes.Compare(h[:], expected) != 0 {`
	`288`	`+ if !bytes.Equal(h[:], expected) {`
`292`	`289`	`return ErrInvalidChecksum`
`293`	`290`	`}`
`294`	`291`
`@@ -407,7 +404,7 @@ func (d resolveUndoDecoder) Decode(ru ResolveUndo) error {`
`407`	`404`
`408`	`405`	`func (d resolveUndoDecoder) readEntry() (ResolveUndoEntry, error) {`
`409`	`406`	`e := &ResolveUndoEntry{`
`410`		`- Stages: make(map[Stage]plumbing.Hash, 0),`
	`407`	`+ Stages: make(map[Stage]plumbing.Hash),`
`411`	`408`	`}`
`412`	`409`
`413`	`410`	`path, err := binary.ReadUntil(d.r, '\x00')`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ func NewDecoderForType(s *Scanner, o storer.EncodedObjectStorer,`
`105`	`105`	`o: o,`
`106`	`106`
`107`	`107`	`idx: NewIndex(0),`
`108`		`- offsetToType: make(map[int64]plumbing.ObjectType, 0),`
	`108`	`+ offsetToType: make(map[int64]plumbing.ObjectType),`
`109`	`109`	`decoderType: t,`
`110`	`110`	`}, nil`
`111`	`111`	`}`