From cf370a620689682a51c8d51bbbb32b459405cffc Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Thu, 25 Jun 2009 20:13:56 -0700 Subject: [PATCH] add ./ to imports where necessary R=r DELTA=51 (4 added, 4 deleted, 43 changed) OCL=30759 CL=30778 --- doc/progs/cat.go | 2 +- doc/progs/cat_rot13.go | 2 +- doc/progs/helloworld3.go | 2 +- src/cmd/gobuild/gobuild.go | 3 ++- src/cmd/gobuild/main.go | 4 +--- src/cmd/gobuild/makefile.go | 3 ++- test/fixedbugs/bug083.dir/bug1.go | 2 +- test/fixedbugs/bug088.dir/bug1.go | 2 +- test/fixedbugs/bug106.dir/bug1.go | 2 +- test/fixedbugs/bug133.dir/bug1.go | 2 +- test/fixedbugs/bug133.dir/bug2.go | 4 ++-- test/fixedbugs/bug160.dir/y.go | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/progs/cat.go b/doc/progs/cat.go index f0f534926ec..f9f00b6e325 100644 --- a/doc/progs/cat.go +++ b/doc/progs/cat.go @@ -5,7 +5,7 @@ package main import ( - "file"; + "./file"; "flag"; "fmt"; "os"; diff --git a/doc/progs/cat_rot13.go b/doc/progs/cat_rot13.go index 931fdf03c34..ea608b83d7f 100644 --- a/doc/progs/cat_rot13.go +++ b/doc/progs/cat_rot13.go @@ -5,7 +5,7 @@ package main import ( - "file"; + "./file"; "flag"; "fmt"; "os"; diff --git a/doc/progs/helloworld3.go b/doc/progs/helloworld3.go index 01fc3e30a1f..ea567fe1bdc 100644 --- a/doc/progs/helloworld3.go +++ b/doc/progs/helloworld3.go @@ -5,7 +5,7 @@ package main import ( - "file"; + "./file"; "fmt"; "os"; ) diff --git a/src/cmd/gobuild/gobuild.go b/src/cmd/gobuild/gobuild.go index 3cca7b48549..a6497425cc2 100644 --- a/src/cmd/gobuild/gobuild.go +++ b/src/cmd/gobuild/gobuild.go @@ -7,7 +7,6 @@ package gobuild import ( "flag"; "fmt"; - "gobuild"; "io"; "os"; "path"; @@ -16,6 +15,8 @@ import ( "template"; "unicode"; "utf8"; + + "./gobuild"; ) type Pkg struct diff --git a/src/cmd/gobuild/main.go b/src/cmd/gobuild/main.go index da781f98867..b5bef4d3339 100644 --- a/src/cmd/gobuild/main.go +++ b/src/cmd/gobuild/main.go @@ -4,9 +4,7 @@ package main -import ( - "gobuild"; -) +import "./gobuild"; func main() { gobuild.Main(); diff --git a/src/cmd/gobuild/makefile.go b/src/cmd/gobuild/makefile.go index 5db633c17c5..36a9ee034ce 100644 --- a/src/cmd/gobuild/makefile.go +++ b/src/cmd/gobuild/makefile.go @@ -6,10 +6,11 @@ package gobuild import ( "fmt"; - "gobuild"; "io"; "path"; "template"; + + "./gobuild"; ) var makefileTemplate = ` diff --git a/test/fixedbugs/bug083.dir/bug1.go b/test/fixedbugs/bug083.dir/bug1.go index ac6a73844d3..a48edbe3307 100644 --- a/test/fixedbugs/bug083.dir/bug1.go +++ b/test/fixedbugs/bug083.dir/bug1.go @@ -4,7 +4,7 @@ package bug1 -import "bug0" +import "./bug0" // This is expected to fail--t0 is in package bug0 and should not be // visible here in package bug1. The test for failure is in diff --git a/test/fixedbugs/bug088.dir/bug1.go b/test/fixedbugs/bug088.dir/bug1.go index 7c21c25dea1..9cb60324d08 100644 --- a/test/fixedbugs/bug088.dir/bug1.go +++ b/test/fixedbugs/bug088.dir/bug1.go @@ -4,7 +4,7 @@ package main -import P "bug0" +import P "./bug0" func main() { a0 := P.V0(); // works diff --git a/test/fixedbugs/bug106.dir/bug1.go b/test/fixedbugs/bug106.dir/bug1.go index 663a26dd25f..6ef40e94a22 100644 --- a/test/fixedbugs/bug106.dir/bug1.go +++ b/test/fixedbugs/bug106.dir/bug1.go @@ -3,5 +3,5 @@ // license that can be found in the LICENSE file. package bug1 -import "bug0" +import "./bug0" diff --git a/test/fixedbugs/bug133.dir/bug1.go b/test/fixedbugs/bug133.dir/bug1.go index 2ab5447e3cc..75621478851 100644 --- a/test/fixedbugs/bug133.dir/bug1.go +++ b/test/fixedbugs/bug133.dir/bug1.go @@ -4,6 +4,6 @@ package bug1 -import "bug0" +import "./bug0" type T struct { t bug0.T } diff --git a/test/fixedbugs/bug133.dir/bug2.go b/test/fixedbugs/bug133.dir/bug2.go index bf39f2f6f8c..2b2b50b7f3b 100644 --- a/test/fixedbugs/bug133.dir/bug2.go +++ b/test/fixedbugs/bug133.dir/bug2.go @@ -4,8 +4,8 @@ package bug1 -import "bug1" -import "bug0" +import "./bug1" +import "./bug0" type T2 struct { t bug0.T } diff --git a/test/fixedbugs/bug160.dir/y.go b/test/fixedbugs/bug160.dir/y.go index 1c8d353d7e7..27e2f352a41 100644 --- a/test/fixedbugs/bug160.dir/y.go +++ b/test/fixedbugs/bug160.dir/y.go @@ -5,7 +5,7 @@ package main import "os" -import "x" +import "./x" func main() { if x.Zero != 0 {