diff options
Diffstat (limited to 'internal/plan/chain.go')
| -rw-r--r-- | internal/plan/chain.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/internal/plan/chain.go b/internal/plan/chain.go index b8a95f6..7c95d9b 100644 --- a/internal/plan/chain.go +++ b/internal/plan/chain.go @@ -25,13 +25,13 @@ type Claims struct { // NewClaims returns an empty Claims, ready to pass to Build. func NewClaims() *Claims { - return &Claims{taken: claimed{}} + return &Claims{taken: newClaimed()} } // Claim marks path as spoken for: a later Build call of the run treats it // as another step's result, never displacing it (spec ยง7.4). func (c *Claims) Claim(path string) { - c.taken[path] = true + c.taken.taken[path] = true } // Input is one file and the rules that matched it, in match order. @@ -80,7 +80,7 @@ func Build(root string, in []Input, now time.Time, d Disk, claims *Claims) []Cha // takes a free name there, exactly as suffix already did for a path that // exists on disk. for _, x := range in { - claims.taken[x.File.Path] = true + claims.taken.taken[x.File.Path] = true } chains := make([]Chain, len(in)) for _, i := range order { @@ -152,7 +152,7 @@ func buildOne(root string, in Input, now time.Time, d Disk, claim claimed) Chain // a name be claimed before its file has actually // vacated it - and stays; do not "fix" it by weakening // the disk check. - claim[resolved] = true + claim.taken[resolved] = true if a.Kind == config.Move { cur = resolved moves++ @@ -184,7 +184,7 @@ func buildOne(root string, in Input, now time.Time, d Disk, claim claimed) Chain step.Displaces = displaces if skip == "" { cur = resolved - claim[resolved] = true + claim.taken[resolved] = true } case config.Delete, config.DeletePermanent: |