rayan/go-task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2026-06-25 05:35:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: includes uses pointers

Browse Source
This commit is contained in:
Pete Davison
2024-03-29 04:29:03 +00:00
parent 24059a4b76
commit 6951e5cd0c
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
taskfile/ast/graph.go
View File

@@ -79,7 +79,7 @@ func (tfg *TaskfileGraph) Merge() (*Taskfile, error) {
}
// Get the merge options
include, ok := edge.Properties.Data.(Include)
include, ok := edge.Properties.Data.(*Include)
if !ok {
return fmt.Errorf("task: Failed to get merge options")
}
@@ -87,7 +87,7 @@ func (tfg *TaskfileGraph) Merge() (*Taskfile, error) {
// Merge the included Taskfile into the parent Taskfile
if err := vertex.Taskfile.Merge(
includedVertex.Taskfile,
&include,
include,
); err != nil {
return err
}

6
taskfile/ast/include.go
View File

@@ -22,7 +22,7 @@ type Include struct {
// Includes represents information about included tasksfiles
type Includes struct {
omap.OrderedMap[string, Include]
omap.OrderedMap[string, *Include]
}
// UnmarshalYAML implements the yaml.Unmarshaler interface.
@@ -41,7 +41,7 @@ func (includes *Includes) UnmarshalYAML(node *yaml.Node) error {
return err
}
v.Namespace = keyNode.Value
includes.Set(keyNode.Value, v)
includes.Set(keyNode.Value, &v)
}
return nil
}
@@ -58,7 +58,7 @@ func (includes *Includes) Len() int {
}
// Wrapper around OrderedMap.Set to ensure we don't get nil pointer errors
func (includes *Includes) Range(f func(k string, v Include) error) error {
func (includes *Includes) Range(f func(k string, v *Include) error) error {
if includes == nil {
return nil
}