qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 11:44:45 -07:00
Code Releases Activity

refactor: don't litter the source tree with backup turdlets.

Browse Source 
Also, restore from backup if the replacement file cannot be written.

LGTM=sameer
R=sameer
CC=golang-codereviews
https://golang.org/cl/155660043
This commit is contained in:
Alan Donovan 2014-10-21 11:15:00 -04:00
parent 0dc96eb944
commit 7f1538dc8c
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
refactor/rename/rename.go
View File

@ -304,8 +304,21 @@ func plural(n int) string {
return "" return ""
} }
func writeFile(name string, fset *token.FileSet, f *ast.File) error {
out, err := os.Create(name)
if err != nil {
// assume error includes the filename
return fmt.Errorf("failed to open file: %s", err)
}
if err := format.Node(out, fset, f); err != nil {
out.Close() // ignore error
return fmt.Errorf("failed to write file: %s", err)
}
return out.Close()
}
var rewriteFile = func(fset *token.FileSet, f *ast.File, orig string) (err error) { var rewriteFile = func(fset *token.FileSet, f *ast.File, orig string) (err error) {
backup := orig + ".prename" backup := orig + ".gorename.backup"
// TODO(adonovan): print packages and filenames in a form useful // TODO(adonovan): print packages and filenames in a form useful
// to editors (so they can reload files). // to editors (so they can reload files).
if Verbose { if Verbose {
@ -315,18 +328,12 @@ var rewriteFile = func(fset *token.FileSet, f *ast.File, orig string) (err error
return fmt.Errorf("failed to make backup %s -> %s: %s", return fmt.Errorf("failed to make backup %s -> %s: %s",
orig, filepath.Base(backup), err) orig, filepath.Base(backup), err)
} }
out, err := os.Create(orig) if err := writeFile(orig, fset, f); err != nil {
if err != nil { // Restore the file from the backup.
// assume error includes the filename os.Remove(orig) // ignore error
return fmt.Errorf("failed to open file: %s", err) os.Rename(backup, orig) // ignore error
} return err
defer func() {
if closeErr := out.Close(); err == nil {
err = closeErr // don't clobber existing error
}
}()
if err := format.Node(out, fset, f); err != nil {
return fmt.Errorf("failed to write file: %s", err)
} }
os.Remove(backup) // ignore error
return nil return nil
} }