Skip to content

Commit 3d88e16

Browse files
committed
Use pointers for SourceFile queues
1 parent 8131a24 commit 3d88e16

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

legacy/builder/types/accessories.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@ package types
1717

1818
import "golang.org/x/exp/slices"
1919

20-
type UniqueSourceFileQueue []SourceFile
20+
type UniqueSourceFileQueue []*SourceFile
2121

2222
func (queue UniqueSourceFileQueue) Len() int { return len(queue) }
2323
func (queue UniqueSourceFileQueue) Less(i, j int) bool { return false }
2424
func (queue UniqueSourceFileQueue) Swap(i, j int) { panic("Who called me?!?") }
2525

26-
func (queue *UniqueSourceFileQueue) Push(value SourceFile) {
27-
equals := func(elem SourceFile) bool {
26+
func (queue *UniqueSourceFileQueue) Push(value *SourceFile) {
27+
equals := func(elem *SourceFile) bool {
2828
return elem.Origin == value.Origin && elem.RelativePath.EqualsTo(value.RelativePath)
2929
}
3030
if !slices.ContainsFunc(*queue, equals) {
3131
*queue = append(*queue, value)
3232
}
3333
}
3434

35-
func (queue *UniqueSourceFileQueue) Pop() SourceFile {
35+
func (queue *UniqueSourceFileQueue) Pop() *SourceFile {
3636
old := *queue
3737
x := old[0]
3838
*queue = old[1:]

legacy/builder/types/types.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ type SourceFile struct {
3333
// Create a SourceFile containing the given source file path within the
3434
// given origin. The given path can be absolute, or relative within the
3535
// origin's root source folder
36-
func MakeSourceFile(ctx *Context, origin interface{}, path *paths.Path) (SourceFile, error) {
36+
func MakeSourceFile(ctx *Context, origin interface{}, path *paths.Path) (*SourceFile, error) {
3737
if path.IsAbs() {
3838
var err error
3939
path, err = sourceRoot(ctx, origin).RelTo(path)
4040
if err != nil {
41-
return SourceFile{}, err
41+
return nil, err
4242
}
4343
}
44-
return SourceFile{Origin: origin, RelativePath: path}, nil
44+
return &SourceFile{Origin: origin, RelativePath: path}, nil
4545
}
4646

4747
// Return the build root for the given origin, where build products will

0 commit comments

Comments
 (0)