From 9c673c3051863e9bdea8b93dea2f784484fcf6c5 Mon Sep 17 00:00:00 2001 From: Jay Vyas Date: Tue, 24 Nov 2015 10:19:30 -0500 Subject: [PATCH] Fixing import format in thirdparty libraries to separate local imports. --- third_party/golang/go/ast/print.go | 3 ++- third_party/golang/go/ast/scope.go | 1 + third_party/golang/go/build/build.go | 9 +++++---- third_party/golang/go/doc/doc_test.go | 7 ++++--- third_party/golang/go/parser/error_test.go | 5 +++-- third_party/golang/go/parser/interface.go | 5 +++-- third_party/golang/go/parser/performance_test.go | 3 ++- third_party/golang/go/printer/performance_test.go | 5 +++-- third_party/golang/go/printer/printer.go | 5 +++-- third_party/golang/go/scanner/errors.go | 3 ++- third_party/golang/go/scanner/scanner_test.go | 3 ++- third_party/golang/go/types/scope.go | 3 ++- 12 files changed, 32 insertions(+), 20 deletions(-) diff --git a/third_party/golang/go/ast/print.go b/third_party/golang/go/ast/print.go index 1c1a087f360..63a38e22f85 100644 --- a/third_party/golang/go/ast/print.go +++ b/third_party/golang/go/ast/print.go @@ -8,10 +8,11 @@ package ast import ( "fmt" - "k8s.io/kubernetes/third_party/golang/go/token" "io" "os" "reflect" + + "k8s.io/kubernetes/third_party/golang/go/token" ) // A FieldFilter may be provided to Fprint to control the output. diff --git a/third_party/golang/go/ast/scope.go b/third_party/golang/go/ast/scope.go index eac63dbf08b..0dbf751b0a5 100644 --- a/third_party/golang/go/ast/scope.go +++ b/third_party/golang/go/ast/scope.go @@ -9,6 +9,7 @@ package ast import ( "bytes" "fmt" + "k8s.io/kubernetes/third_party/golang/go/token" ) diff --git a/third_party/golang/go/build/build.go b/third_party/golang/go/build/build.go index 82e71a4aac0..7f7d025b10f 100644 --- a/third_party/golang/go/build/build.go +++ b/third_party/golang/go/build/build.go @@ -8,10 +8,6 @@ import ( "bytes" "errors" "fmt" - "k8s.io/kubernetes/third_party/golang/go/ast" - "k8s.io/kubernetes/third_party/golang/go/doc" - "k8s.io/kubernetes/third_party/golang/go/parser" - "k8s.io/kubernetes/third_party/golang/go/token" "io" "io/ioutil" "log" @@ -24,6 +20,11 @@ import ( "strings" "unicode" "unicode/utf8" + + "k8s.io/kubernetes/third_party/golang/go/ast" + "k8s.io/kubernetes/third_party/golang/go/doc" + "k8s.io/kubernetes/third_party/golang/go/parser" + "k8s.io/kubernetes/third_party/golang/go/token" ) // A Context specifies the supporting context for a build. diff --git a/third_party/golang/go/doc/doc_test.go b/third_party/golang/go/doc/doc_test.go index a2f3f29c940..2677c14faf6 100644 --- a/third_party/golang/go/doc/doc_test.go +++ b/third_party/golang/go/doc/doc_test.go @@ -8,9 +8,6 @@ import ( "bytes" "flag" "fmt" - "k8s.io/kubernetes/third_party/golang/go/parser" - "k8s.io/kubernetes/third_party/golang/go/printer" - "k8s.io/kubernetes/third_party/golang/go/token" "io/ioutil" "os" "path/filepath" @@ -18,6 +15,10 @@ import ( "strings" "testing" "text/template" + + "k8s.io/kubernetes/third_party/golang/go/parser" + "k8s.io/kubernetes/third_party/golang/go/printer" + "k8s.io/kubernetes/third_party/golang/go/token" ) var update = flag.Bool("update", false, "update golden (.out) files") diff --git a/third_party/golang/go/parser/error_test.go b/third_party/golang/go/parser/error_test.go index ea63a49d344..c249950db6f 100644 --- a/third_party/golang/go/parser/error_test.go +++ b/third_party/golang/go/parser/error_test.go @@ -23,13 +23,14 @@ package parser import ( - "k8s.io/kubernetes/third_party/golang/go/scanner" - "k8s.io/kubernetes/third_party/golang/go/token" "io/ioutil" "path/filepath" "regexp" "strings" "testing" + + "k8s.io/kubernetes/third_party/golang/go/scanner" + "k8s.io/kubernetes/third_party/golang/go/token" ) const testdata = "testdata" diff --git a/third_party/golang/go/parser/interface.go b/third_party/golang/go/parser/interface.go index cef2053b1dd..414096242ae 100644 --- a/third_party/golang/go/parser/interface.go +++ b/third_party/golang/go/parser/interface.go @@ -9,13 +9,14 @@ package parser import ( "bytes" "errors" - "k8s.io/kubernetes/third_party/golang/go/ast" - "k8s.io/kubernetes/third_party/golang/go/token" "io" "io/ioutil" "os" "path/filepath" "strings" + + "k8s.io/kubernetes/third_party/golang/go/ast" + "k8s.io/kubernetes/third_party/golang/go/token" ) // If src != nil, readSource converts src to a []byte if possible; diff --git a/third_party/golang/go/parser/performance_test.go b/third_party/golang/go/parser/performance_test.go index df76b057fe9..6737647b82a 100644 --- a/third_party/golang/go/parser/performance_test.go +++ b/third_party/golang/go/parser/performance_test.go @@ -5,9 +5,10 @@ package parser import ( - "k8s.io/kubernetes/third_party/golang/go/token" "io/ioutil" "testing" + + "k8s.io/kubernetes/third_party/golang/go/token" ) var src = readFile("parser.go") diff --git a/third_party/golang/go/printer/performance_test.go b/third_party/golang/go/printer/performance_test.go index d182d11f117..4db70cd8c8f 100644 --- a/third_party/golang/go/printer/performance_test.go +++ b/third_party/golang/go/printer/performance_test.go @@ -9,10 +9,11 @@ package printer import ( "bytes" - "k8s.io/kubernetes/third_party/golang/go/ast" - "k8s.io/kubernetes/third_party/golang/go/parser" "io" "io/ioutil" + + "k8s.io/kubernetes/third_party/golang/go/ast" + "k8s.io/kubernetes/third_party/golang/go/parser" "log" "testing" ) diff --git a/third_party/golang/go/printer/printer.go b/third_party/golang/go/printer/printer.go index 467824cade7..1fa244f2843 100644 --- a/third_party/golang/go/printer/printer.go +++ b/third_party/golang/go/printer/printer.go @@ -7,14 +7,15 @@ package printer import ( "fmt" - "k8s.io/kubernetes/third_party/golang/go/ast" - "k8s.io/kubernetes/third_party/golang/go/token" "io" "os" "strconv" "strings" "text/tabwriter" "unicode" + + "k8s.io/kubernetes/third_party/golang/go/ast" + "k8s.io/kubernetes/third_party/golang/go/token" ) const ( diff --git a/third_party/golang/go/scanner/errors.go b/third_party/golang/go/scanner/errors.go index 571071d2a97..4eb3d5b740d 100644 --- a/third_party/golang/go/scanner/errors.go +++ b/third_party/golang/go/scanner/errors.go @@ -6,9 +6,10 @@ package scanner import ( "fmt" - "k8s.io/kubernetes/third_party/golang/go/token" "io" "sort" + + "k8s.io/kubernetes/third_party/golang/go/token" ) // In an ErrorList, an error is represented by an *Error. diff --git a/third_party/golang/go/scanner/scanner_test.go b/third_party/golang/go/scanner/scanner_test.go index c69878e3576..1852a7acd33 100644 --- a/third_party/golang/go/scanner/scanner_test.go +++ b/third_party/golang/go/scanner/scanner_test.go @@ -5,12 +5,13 @@ package scanner import ( - "k8s.io/kubernetes/third_party/golang/go/token" "io/ioutil" "os" "path/filepath" "runtime" "testing" + + "k8s.io/kubernetes/third_party/golang/go/token" ) var fset = token.NewFileSet() diff --git a/third_party/golang/go/types/scope.go b/third_party/golang/go/types/scope.go index c9f7fcedcb6..a352490b829 100644 --- a/third_party/golang/go/types/scope.go +++ b/third_party/golang/go/types/scope.go @@ -9,10 +9,11 @@ package types import ( "bytes" "fmt" - "k8s.io/kubernetes/third_party/golang/go/token" "io" "sort" "strings" + + "k8s.io/kubernetes/third_party/golang/go/token" ) // TODO(gri) Provide scopes with a name or other mechanism so that