From b5bb9226a74d9eb8369c0525a3e2a8e4338bd007 Mon Sep 17 00:00:00 2001 From: Dimitar Petrov Date: Sun, 6 Sep 2020 21:43:27 +0300 Subject: [PATCH] Fix imports --- cmd/apply.go | 2 +- cmd/revert.go | 2 +- tracing/deinstrument_test.go | 4 +-- tracing/instrument.go | 2 +- tracing/instrument_test.go | 12 +++---- tracing/tracingfakes/fake_imports_groomer.go | 36 ++++++++++---------- tracing/unused_imports_test.go | 4 +-- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/cmd/apply.go b/cmd/apply.go index 5487280..126ceba 100644 --- a/cmd/apply.go +++ b/cmd/apply.go @@ -41,6 +41,6 @@ func (ac *ApplyCmd) Run() error { if err != nil { return err } - return ac.importsGroomer.RemoveUnusedImportFromDirectory(path, map[string]string{"fmt":"", "runtime":"rt", "rand":""}) + return ac.importsGroomer.RemoveUnusedImportFromDirectory(path, map[string]string{"fmt":"", "runtime":"rt", "rand":""}) // TODO: flag for import aliases }) } diff --git a/cmd/revert.go b/cmd/revert.go index 5cdb142..b69222b 100644 --- a/cmd/revert.go +++ b/cmd/revert.go @@ -41,6 +41,6 @@ func (rc *RevertCmd) Run() error { if err != nil { return err } - return rc.importsGroomer.RemoveUnusedImportFromDirectory(path, map[string]string{"fmt":"", "runtime":"rt", "rand":""}) + return rc.importsGroomer.RemoveUnusedImportFromDirectory(path, map[string]string{"fmt":"", "runtime":"rt", "crypto/rand":""}) // TODO: flag for import aliases }) } diff --git a/tracing/deinstrument_test.go b/tracing/deinstrument_test.go index 2746c0f..dd5409e 100644 --- a/tracing/deinstrument_test.go +++ b/tracing/deinstrument_test.go @@ -43,7 +43,7 @@ func TestDeinstrumentFile(t *testing.T) { } var buff2 bytes.Buffer - if err := NewImportsGroomer().RemoveUnusedImportFromFile(fset, file, &buff2, map[string]string{"fmt":"", "runtime":"rt", "rand":""}); err != nil { + if err := NewImportsGroomer().RemoveUnusedImportFromFile(fset, file, &buff2, map[string]string{"fmt":"", "runtime":"rt", "crypto/rand":""}); err != nil { t.Fatal(err) } @@ -87,7 +87,7 @@ func TestDeinstrumentDirectory(t *testing.T) { t.Fatal(err) } - if err := NewImportsGroomer().RemoveUnusedImportFromDirectory("test", map[string]string{"fmt":"", "runtime":"rt", "rand":""}); err != nil { + if err := NewImportsGroomer().RemoveUnusedImportFromDirectory("test", map[string]string{"fmt":"", "runtime":"rt", "crypto/rand":""}); err != nil { t.Fatal(err) } diff --git a/tracing/instrument.go b/tracing/instrument.go index e2161d6..194192a 100644 --- a/tracing/instrument.go +++ b/tracing/instrument.go @@ -84,7 +84,7 @@ func (ci *codeInstrumenter) InstrumentPackage(fset *token.FileSet, pkg *ast.Pack func (ci *codeInstrumenter) InstrumentFile(fset *token.FileSet, file *ast.File, out io.Writer) error { astutil.AddImport(fset, file, "fmt") astutil.AddNamedImport(fset, file, "rt", "runtime") - astutil.AddImport(fset, file, "rand") + astutil.AddImport(fset, file, "crypto/rand") // Needed because ast does not support floating comments and deletes them. // In order to preserve all comments we just pre-parse it to dst which treats them as first class citizens. diff --git a/tracing/instrument_test.go b/tracing/instrument_test.go index 78c44e2..cee4c5b 100644 --- a/tracing/instrument_test.go +++ b/tracing/instrument_test.go @@ -27,8 +27,8 @@ func main() { const resultCodeWithoutImports = `package a import ( + "crypto/rand" "fmt" - "rand" rt "runtime" ) @@ -79,8 +79,8 @@ func main() { const editedResultCodeWithoutImports = `package a import ( + "crypto/rand" "fmt" - "rand" rt "runtime" ) @@ -149,8 +149,8 @@ func main() { const resultCodeWithFmtImport = `package a import ( + "crypto/rand" "fmt" - "rand" rt "runtime" ) @@ -222,8 +222,8 @@ func main() { const resultCodeWithMultipleImports = `package a import ( + "crypto/rand" "fmt" - "rand" rt "runtime" "strconv" ) @@ -295,8 +295,8 @@ func main() { const resultCodeWithImportsWithoutFmt = `package a import ( + "crypto/rand" "fmt" - "rand" rt "runtime" "strconv" ) @@ -356,8 +356,8 @@ type test struct { const resultCodeWithoutFunction = `package a import ( + "crypto/rand" "fmt" - "rand" rt "runtime" ) diff --git a/tracing/tracingfakes/fake_imports_groomer.go b/tracing/tracingfakes/fake_imports_groomer.go index 756fdf2..d79c07e 100644 --- a/tracing/tracingfakes/fake_imports_groomer.go +++ b/tracing/tracingfakes/fake_imports_groomer.go @@ -11,11 +11,11 @@ import ( ) type FakeImportsGroomer struct { - RemoveUnusedImportFromDirectoryStub func(string, string) error + RemoveUnusedImportFromDirectoryStub func(string, map[string]string) error removeUnusedImportFromDirectoryMutex sync.RWMutex removeUnusedImportFromDirectoryArgsForCall []struct { arg1 string - arg2 string + arg2 map[string]string } removeUnusedImportFromDirectoryReturns struct { result1 error @@ -23,13 +23,13 @@ type FakeImportsGroomer struct { removeUnusedImportFromDirectoryReturnsOnCall map[int]struct { result1 error } - RemoveUnusedImportFromFileStub func(*token.FileSet, *ast.File, io.Writer, string) error + RemoveUnusedImportFromFileStub func(*token.FileSet, *ast.File, io.Writer, map[string]string) error removeUnusedImportFromFileMutex sync.RWMutex removeUnusedImportFromFileArgsForCall []struct { arg1 *token.FileSet arg2 *ast.File arg3 io.Writer - arg4 string + arg4 map[string]string } removeUnusedImportFromFileReturns struct { result1 error @@ -37,12 +37,12 @@ type FakeImportsGroomer struct { removeUnusedImportFromFileReturnsOnCall map[int]struct { result1 error } - RemoveUnusedImportFromPackageStub func(*token.FileSet, *ast.Package, string) error + RemoveUnusedImportFromPackageStub func(*token.FileSet, *ast.Package, map[string]string) error removeUnusedImportFromPackageMutex sync.RWMutex removeUnusedImportFromPackageArgsForCall []struct { arg1 *token.FileSet arg2 *ast.Package - arg3 string + arg3 map[string]string } removeUnusedImportFromPackageReturns struct { result1 error @@ -54,12 +54,12 @@ type FakeImportsGroomer struct { invocationsMutex sync.RWMutex } -func (fake *FakeImportsGroomer) RemoveUnusedImportFromDirectory(arg1 string, arg2 string) error { +func (fake *FakeImportsGroomer) RemoveUnusedImportFromDirectory(arg1 string, arg2 map[string]string) error { fake.removeUnusedImportFromDirectoryMutex.Lock() ret, specificReturn := fake.removeUnusedImportFromDirectoryReturnsOnCall[len(fake.removeUnusedImportFromDirectoryArgsForCall)] fake.removeUnusedImportFromDirectoryArgsForCall = append(fake.removeUnusedImportFromDirectoryArgsForCall, struct { arg1 string - arg2 string + arg2 map[string]string }{arg1, arg2}) fake.recordInvocation("RemoveUnusedImportFromDirectory", []interface{}{arg1, arg2}) fake.removeUnusedImportFromDirectoryMutex.Unlock() @@ -79,13 +79,13 @@ func (fake *FakeImportsGroomer) RemoveUnusedImportFromDirectoryCallCount() int { return len(fake.removeUnusedImportFromDirectoryArgsForCall) } -func (fake *FakeImportsGroomer) RemoveUnusedImportFromDirectoryCalls(stub func(string, string) error) { +func (fake *FakeImportsGroomer) RemoveUnusedImportFromDirectoryCalls(stub func(string, map[string]string) error) { fake.removeUnusedImportFromDirectoryMutex.Lock() defer fake.removeUnusedImportFromDirectoryMutex.Unlock() fake.RemoveUnusedImportFromDirectoryStub = stub } -func (fake *FakeImportsGroomer) RemoveUnusedImportFromDirectoryArgsForCall(i int) (string, string) { +func (fake *FakeImportsGroomer) RemoveUnusedImportFromDirectoryArgsForCall(i int) (string, map[string]string) { fake.removeUnusedImportFromDirectoryMutex.RLock() defer fake.removeUnusedImportFromDirectoryMutex.RUnlock() argsForCall := fake.removeUnusedImportFromDirectoryArgsForCall[i] @@ -115,14 +115,14 @@ func (fake *FakeImportsGroomer) RemoveUnusedImportFromDirectoryReturnsOnCall(i i }{result1} } -func (fake *FakeImportsGroomer) RemoveUnusedImportFromFile(arg1 *token.FileSet, arg2 *ast.File, arg3 io.Writer, arg4 string) error { +func (fake *FakeImportsGroomer) RemoveUnusedImportFromFile(arg1 *token.FileSet, arg2 *ast.File, arg3 io.Writer, arg4 map[string]string) error { fake.removeUnusedImportFromFileMutex.Lock() ret, specificReturn := fake.removeUnusedImportFromFileReturnsOnCall[len(fake.removeUnusedImportFromFileArgsForCall)] fake.removeUnusedImportFromFileArgsForCall = append(fake.removeUnusedImportFromFileArgsForCall, struct { arg1 *token.FileSet arg2 *ast.File arg3 io.Writer - arg4 string + arg4 map[string]string }{arg1, arg2, arg3, arg4}) fake.recordInvocation("RemoveUnusedImportFromFile", []interface{}{arg1, arg2, arg3, arg4}) fake.removeUnusedImportFromFileMutex.Unlock() @@ -142,13 +142,13 @@ func (fake *FakeImportsGroomer) RemoveUnusedImportFromFileCallCount() int { return len(fake.removeUnusedImportFromFileArgsForCall) } -func (fake *FakeImportsGroomer) RemoveUnusedImportFromFileCalls(stub func(*token.FileSet, *ast.File, io.Writer, string) error) { +func (fake *FakeImportsGroomer) RemoveUnusedImportFromFileCalls(stub func(*token.FileSet, *ast.File, io.Writer, map[string]string) error) { fake.removeUnusedImportFromFileMutex.Lock() defer fake.removeUnusedImportFromFileMutex.Unlock() fake.RemoveUnusedImportFromFileStub = stub } -func (fake *FakeImportsGroomer) RemoveUnusedImportFromFileArgsForCall(i int) (*token.FileSet, *ast.File, io.Writer, string) { +func (fake *FakeImportsGroomer) RemoveUnusedImportFromFileArgsForCall(i int) (*token.FileSet, *ast.File, io.Writer, map[string]string) { fake.removeUnusedImportFromFileMutex.RLock() defer fake.removeUnusedImportFromFileMutex.RUnlock() argsForCall := fake.removeUnusedImportFromFileArgsForCall[i] @@ -178,13 +178,13 @@ func (fake *FakeImportsGroomer) RemoveUnusedImportFromFileReturnsOnCall(i int, r }{result1} } -func (fake *FakeImportsGroomer) RemoveUnusedImportFromPackage(arg1 *token.FileSet, arg2 *ast.Package, arg3 string) error { +func (fake *FakeImportsGroomer) RemoveUnusedImportFromPackage(arg1 *token.FileSet, arg2 *ast.Package, arg3 map[string]string) error { fake.removeUnusedImportFromPackageMutex.Lock() ret, specificReturn := fake.removeUnusedImportFromPackageReturnsOnCall[len(fake.removeUnusedImportFromPackageArgsForCall)] fake.removeUnusedImportFromPackageArgsForCall = append(fake.removeUnusedImportFromPackageArgsForCall, struct { arg1 *token.FileSet arg2 *ast.Package - arg3 string + arg3 map[string]string }{arg1, arg2, arg3}) fake.recordInvocation("RemoveUnusedImportFromPackage", []interface{}{arg1, arg2, arg3}) fake.removeUnusedImportFromPackageMutex.Unlock() @@ -204,13 +204,13 @@ func (fake *FakeImportsGroomer) RemoveUnusedImportFromPackageCallCount() int { return len(fake.removeUnusedImportFromPackageArgsForCall) } -func (fake *FakeImportsGroomer) RemoveUnusedImportFromPackageCalls(stub func(*token.FileSet, *ast.Package, string) error) { +func (fake *FakeImportsGroomer) RemoveUnusedImportFromPackageCalls(stub func(*token.FileSet, *ast.Package, map[string]string) error) { fake.removeUnusedImportFromPackageMutex.Lock() defer fake.removeUnusedImportFromPackageMutex.Unlock() fake.RemoveUnusedImportFromPackageStub = stub } -func (fake *FakeImportsGroomer) RemoveUnusedImportFromPackageArgsForCall(i int) (*token.FileSet, *ast.Package, string) { +func (fake *FakeImportsGroomer) RemoveUnusedImportFromPackageArgsForCall(i int) (*token.FileSet, *ast.Package, map[string]string) { fake.removeUnusedImportFromPackageMutex.RLock() defer fake.removeUnusedImportFromPackageMutex.RUnlock() argsForCall := fake.removeUnusedImportFromPackageArgsForCall[i] diff --git a/tracing/unused_imports_test.go b/tracing/unused_imports_test.go index 2522ddf..c980dd3 100644 --- a/tracing/unused_imports_test.go +++ b/tracing/unused_imports_test.go @@ -27,7 +27,7 @@ func TestRemoveUnusedImportsFromFile(t *testing.T) { t.Fatal(err) } var buff bytes.Buffer - if err := NewImportsGroomer().RemoveUnusedImportFromFile(fset, file, &buff, map[string]string{"fmt":"", "runtime":"rt", "rand":""}); err != nil { + if err := NewImportsGroomer().RemoveUnusedImportFromFile(fset, file, &buff, map[string]string{"fmt":"", "runtime":"rt", "crypto/rand":""}); err != nil { t.Fatal(err) } @@ -63,7 +63,7 @@ func TestRemoveUnusedImportsFromDirectory(t *testing.T) { i++ } - if err := NewImportsGroomer().RemoveUnusedImportFromDirectory("test", map[string]string{"fmt":"", "runtime":"rt", "rand":""}); err != nil { + if err := NewImportsGroomer().RemoveUnusedImportFromDirectory("test", map[string]string{"fmt":"", "runtime":"rt", "crypto/rand":""}); err != nil { t.Fatal(err) }