Skip to content

Commit e334061

Browse files
committed
Use pointers for SourceFile queues
1 parent fe00008 commit e334061

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

legacy/builder/container_find_includes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ func writeCache(cache *includeCache, path *paths.Path) error {
285285
return nil
286286
}
287287

288-
func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile types.SourceFile) error {
288+
func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile *types.SourceFile) error {
289289
sourcePath := sourceFile.SourcePath(ctx)
290290
targetFilePath := paths.NullPath()
291291
depPath := sourceFile.DepfilePath(ctx)

legacy/builder/types/accessories.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,19 @@ func (queue *UniqueStringQueue) Empty() bool {
4343
return queue.Len() == 0
4444
}
4545

46-
type UniqueSourceFileQueue []SourceFile
46+
type UniqueSourceFileQueue []*SourceFile
4747

4848
func (queue UniqueSourceFileQueue) Len() int { return len(queue) }
4949
func (queue UniqueSourceFileQueue) Less(i, j int) bool { return false }
5050
func (queue UniqueSourceFileQueue) Swap(i, j int) { panic("Who called me?!?") }
5151

52-
func (queue *UniqueSourceFileQueue) Push(value SourceFile) {
52+
func (queue *UniqueSourceFileQueue) Push(value *SourceFile) {
5353
if !sliceContainsSourceFile(*queue, value) {
5454
*queue = append(*queue, value)
5555
}
5656
}
5757

58-
func (queue *UniqueSourceFileQueue) Pop() SourceFile {
58+
func (queue *UniqueSourceFileQueue) Pop() *SourceFile {
5959
old := *queue
6060
x := old[0]
6161
*queue = old[1:]

legacy/builder/types/types.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ type SourceFile struct {
3434
// Create a SourceFile containing the given source file path within the
3535
// given origin. The given path can be absolute, or relative within the
3636
// origin's root source folder
37-
func MakeSourceFile(ctx *Context, origin interface{}, path *paths.Path) (SourceFile, error) {
37+
func MakeSourceFile(ctx *Context, origin interface{}, path *paths.Path) (*SourceFile, error) {
3838
if path.IsAbs() {
3939
var err error
4040
path, err = sourceRoot(ctx, origin).RelTo(path)
4141
if err != nil {
42-
return SourceFile{}, err
42+
return nil, err
4343
}
4444
}
45-
return SourceFile{Origin: origin, RelativePath: path}, nil
45+
return &SourceFile{Origin: origin, RelativePath: path}, nil
4646
}
4747

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

legacy/builder/types/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func sliceContains(slice []string, target string) bool {
2525
return false
2626
}
2727

28-
func sliceContainsSourceFile(slice []SourceFile, target SourceFile) bool {
28+
func sliceContainsSourceFile(slice []SourceFile, target *SourceFile) bool {
2929
for _, elem := range slice {
3030
if elem.Origin == target.Origin && elem.RelativePath.EqualsTo(target.RelativePath) {
3131
return true

0 commit comments

Comments
 (0)