Commit 9e5276e

committed

Upgrade go-paths / remove duplicate filter function

1 parent cdd7b75 commit 9e5276eCopy full SHA for 9e5276e

File tree

+11

-16

lines changed

+11

-16

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`---`
`2`	`2`	`name: github.com/arduino/go-paths-helper`
`3`		`-version: v1.10.1`
	`3`	`+version: v1.11.0`
`4`	`4`	`type: go`
`5`	`5`	`summary:`
`6`	`6`	`homepage: https://pkg.go.dev/github.com/arduino/go-paths-helper`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ replace github.com/mailru/easyjson => github.com/cmaglie/easyjson v0.8.1`
`7`	`7`
`8`	`8`	`require (`
`9`	`9`	`github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371`
`10`		`- github.com/arduino/go-paths-helper v1.10.1`
	`10`	`+ github.com/arduino/go-paths-helper v1.11.0`
`11`	`11`	`github.com/arduino/go-properties-orderedmap v1.8.0`
`12`	`12`	`github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b`
`13`	`13`	`github.com/arduino/go-win32-utils v1.0.0`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ`
`11`	`11`	`github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=`
`12`	`12`	`github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=`
`13`	`13`	`github.com/arduino/go-paths-helper v1.0.1/go.mod h1:HpxtKph+g238EJHq4geEPv9p+gl3v5YYu35Yb+w31Ck=`
`14`		`-github.com/arduino/go-paths-helper v1.10.1 h1:j8InnhLrSeoPiOvTnZL0XMFt7l407ciTBJJJs7W9bs4=`
`15`		`-github.com/arduino/go-paths-helper v1.10.1/go.mod h1:jcpW4wr0u69GlXhTYydsdsqAjLaYK5n7oWHfKqOG6LM=`
	`14`	`+github.com/arduino/go-paths-helper v1.11.0 h1:hkpGb9AtCTByTj2FKutuHWb3klDf4kAKL10hW+fN+oE=`
	`15`	`+github.com/arduino/go-paths-helper v1.11.0/go.mod h1:jcpW4wr0u69GlXhTYydsdsqAjLaYK5n7oWHfKqOG6LM=`
`16`	`16`	`github.com/arduino/go-properties-orderedmap v1.8.0 h1:wEfa6hHdpezrVOh787OmClsf/Kd8qB+zE3P2Xbrn0CQ=`
`17`	`17`	`github.com/arduino/go-properties-orderedmap v1.8.0/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk=`
`18`	`18`	`github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b h1:9hDi4F2st6dbLC3y4i02zFT5quS4X6iioWifGlVwfy4=`

Lines changed: 7 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,16 +22,6 @@ import (`
`22`	`22`	`"github.com/arduino/go-paths-helper"`
`23`	`23`	`)`
`24`	`24`
`25`		`-func filter(p paths.PathList, filter func(paths.Path) bool) paths.PathList {`
`26`		`- res := (*p)[:0]`
`27`		`- for _, path := range *p {`
`28`		`- if filter(path) {`
`29`		`- res = append(res, path)`
`30`		`- }`
`31`		`- }`
`32`		`- return res`
`33`		`-}`
`34`		`-`
`35`	`25`	`// link fixdoc`
`36`	`26`	`func (b *Builder) link() error {`
`37`	`27`	`if b.onlyUpdateCompilationDatabase {`
`@@ -64,14 +54,19 @@ func (b *Builder) link() error {`
`64`	`54`	`// because thery are both named spi.o.`
`65`	`55`
`66`	`56`	`archives := paths.NewPathList()`
`67`		`-`
`68`	`57`	`for _, object := range objectFiles {`
`69`	`58`	`archive := object.Parent().Join("objs.a")`
`70`	`59`	`archives.AddIfMissing(archive)`
`71`	`60`	`}`
`72`	`61`
	`62`	`+ // Generate archive for each directory`
`73`	`63`	`for _, archive := range archives {`
`74`		`- relatedObjectFiles := filter(&objectFiles, func(object *paths.Path) bool { return object.Parent().EquivalentTo(archive.Parent()) })`
	`64`	`+ archiveDir := archive.Parent()`
	`65`	`+ relatedObjectFiles := objectFiles.Clone()`
	`66`	`+ relatedObjectFiles.Filter(func(object *paths.Path) bool {`
	`67`	`+ // extract all the object files that are in the same directory of the archive`
	`68`	`+ return object.Parent().EquivalentTo(archiveDir)`
	`69`	`+ })`
`75`	`70`	`b.archiveCompiledFiles(archive.Parent(), paths.New(archive.Base()), relatedObjectFiles)`
`76`	`71`	`}`
`77`	`72`

Comments

(0)