From cc9ee401376567842baa87039468390b6462045e Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Tue, 19 Nov 2019 22:05:54 +0100
Subject: [PATCH] Use consistent receiver name

---
 internal/chezmoi/fsmutator_posix.go   | 16 ++++++++--------
 internal/chezmoi/fsmutator_windows.go |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/internal/chezmoi/fsmutator_posix.go b/internal/chezmoi/fsmutator_posix.go
index 21403574b79..5b398b5175c 100644
--- a/internal/chezmoi/fsmutator_posix.go
+++ b/internal/chezmoi/fsmutator_posix.go
@@ -13,13 +13,13 @@ import (
 )
 
 // WriteFile implements Mutator.WriteFile.
-func (a *FSMutator) WriteFile(name string, data []byte, perm os.FileMode, currData []byte) error {
+func (m *FSMutator) WriteFile(name string, data []byte, perm os.FileMode, currData []byte) error {
 	// Special case: if writing to the real filesystem, use github.com/google/renameio
-	if a.FS == vfs.OSFS {
+	if m.FS == vfs.OSFS {
 		dir := filepath.Dir(name)
-		dev, ok := a.devCache[dir]
+		dev, ok := m.devCache[dir]
 		if !ok {
-			info, err := a.Stat(dir)
+			info, err := m.Stat(dir)
 			if err != nil {
 				return err
 			}
@@ -28,12 +28,12 @@ func (a *FSMutator) WriteFile(name string, data []byte, perm os.FileMode, currDa
 				return errors.New("os.FileInfo.Sys() cannot be converted to a *syscall.Stat_t")
 			}
 			dev = uint(statT.Dev)
-			a.devCache[dir] = dev
+			m.devCache[dir] = dev
 		}
-		tempDir, ok := a.tempDirCache[dev]
+		tempDir, ok := m.tempDirCache[dev]
 		if !ok {
 			tempDir = renameio.TempDir(dir)
-			a.tempDirCache[dev] = tempDir
+			m.tempDirCache[dev] = tempDir
 		}
 		t, err := renameio.TempFile(tempDir, name)
 		if err != nil {
@@ -50,5 +50,5 @@ func (a *FSMutator) WriteFile(name string, data []byte, perm os.FileMode, currDa
 		}
 		return t.CloseAtomicallyReplace()
 	}
-	return a.FS.WriteFile(name, data, perm)
+	return m.FS.WriteFile(name, data, perm)
 }
diff --git a/internal/chezmoi/fsmutator_windows.go b/internal/chezmoi/fsmutator_windows.go
index 87fdb93e6ec..82a919bbec3 100644
--- a/internal/chezmoi/fsmutator_windows.go
+++ b/internal/chezmoi/fsmutator_windows.go
@@ -7,6 +7,6 @@ import (
 )
 
 // WriteFile implements Mutator.WriteFile.
-func (a *FSMutator) WriteFile(name string, data []byte, perm os.FileMode, currData []byte) error {
-	return a.FS.WriteFile(name, data, perm)
+func (m *FSMutator) WriteFile(name string, data []byte, perm os.FileMode, currData []byte) error {
+	return m.FS.WriteFile(name, data, perm)
 }