unused imports

R=r
OCL=34731
CL=34731

src/cmd/ebnflint/ebnflint.go

@@ -13,7 +13,6 @@ import (
 	"io";
 	"os";
 	"path";
-	"sort";
 	"strings";
 )
 
@@ -47,7 +46,7 @@ func extractEBNF(src []byte) []byte {
 		i += len(open);
 
 		// write as many newlines as found in the excluded text
-		// to maintain correct line numbers in error messages 
+		// to maintain correct line numbers in error messages
 		for _, ch := range src[0 : i] {
 			if ch == '\n' {
 				buf.WriteByte('\n');

src/cmd/godoc/godoc.go

@@ -40,13 +40,11 @@ import (
 	"http";
 	"io";
 	"log";
-	"net";
 	"os";
 	pathutil "path";
 	"sort";
 	"strings";
 	"sync";
-	"syscall";
 	"template";
 	"time";
 )

src/cmd/gofmt/gofmt.go

@@ -11,10 +11,8 @@ import (
 	"go/parser";
 	"go/printer";
 	"go/scanner";
-	"io";
 	"os";
 	pathutil "path";
-	"sort";
 	"strings";
 )
 

src/cmd/gotest/gotest

@@ -86,11 +86,23 @@ MAKELEVEL=
 
 importpath=$(make -s importpath)
 {
+	# test functions are named TestFoo
+	# the grep -v eliminates methods and other special names
+	# that have multiple dots.
+	pattern='Test([^a-z].*)?'
+	tests=$(6nm -s _test/$importpath.a $xofile | egrep ' T .*·'$pattern'$' | grep -v '·.*[.·]' | sed 's/.* //; s/·/./')
+	if [ "x$tests" = x ]; then
+		echo 'gotest: error: no tests matching '$pattern in _test/$importpath.a $xofile 1>&2
+		exit 2
+	fi
+
 	# package spec
 	echo 'package main'
 	echo
 	# imports
-	echo 'import "'$importpath'"'
+	if echo "$tests" | egrep -v '_test\.' >/dev/null; then
+		echo 'import "'$importpath'"'
+	fi
 	if $havex; then
 		echo 'import "./_xtest_"'
 	fi
@@ -98,20 +110,10 @@ importpath=$(make -s importpath)
 	# test array
 	echo
 	echo 'var tests = []testing.Test {'
-
-	# test functions are named TestFoo
-	# the grep -v eliminates methods and other special names
-	# that have multiple dots.
-	pattern='Test([^a-z].*)?'
-	tests=$(6nm -s _test/$importpath.a $xofile | egrep ' T .*·'$pattern'$' | grep -v '·.*[.·]' | sed 's/.* //; s/·/./')
-	if [ "x$tests" = x ]; then
-		echo 'gotest: warning: no tests matching '$pattern in _test/$importpath.a $xofile 1>&2
-	else
-		for i in $tests
-		do
-			echo '	testing.Test{ "'$i'", '$i' },'
-		done
-	fi
+	for i in $tests
+	do
+		echo '	testing.Test{ "'$i'", '$i' },'
+	done
 	echo '}'
 	# body
 	echo

src/pkg/archive/tar/reader_test.go

@@ -6,7 +6,6 @@ package tar
 
 import (
 	"bytes";
-	"fmt";
 	"io";
 	"os";
 	"reflect";

src/pkg/archive/tar/writer_test.go

@@ -8,9 +8,6 @@ import (
 	"bytes";
 	"fmt";
 	"io";
-	"os";
-	"reflect";
-	"strings";
 	"testing";
 )
 

src/pkg/compress/flate/flate_test.go

@@ -10,11 +10,7 @@ package flate
 
 import (
 	"bytes";
-	"bufio";
-	"io";
-	"os";
 	"reflect";
-	"strconv";
 	"testing";
 )
 

src/pkg/compress/gzip/gunzip_test.go

@@ -6,7 +6,6 @@ package gzip
 
 import (
 	"bytes";
-	"fmt";
 	"io";
 	"os";
 	"testing";

src/pkg/crypto/aes/aes_test.go

@@ -5,7 +5,6 @@
 package aes
 
 import (
-	"fmt";
 	"testing";
 )
 

src/pkg/crypto/block/cbc_aes_test.go

@@ -14,7 +14,6 @@ import (
 	"bytes";
 	"crypto/aes";
 	"io";
-	"os";
 	"testing";
 )
 

src/pkg/crypto/block/cfb_aes_test.go

@@ -14,7 +14,6 @@ import (
 	"bytes";
 	"crypto/aes";
 	"io";
-	"os";
 	"testing";
 )
 

src/pkg/crypto/block/cmac.go

@@ -7,10 +7,7 @@
 
 package block
 
-import (
-	"io";
-	"os";
-)
+import "os"
 
 const (
 	// minimal irreducible polynomial of degree b

src/pkg/crypto/block/ctr_aes_test.go

@@ -14,7 +14,6 @@ import (
 	"bytes";
 	"crypto/aes";
 	"io";
-	"os";
 	"testing";
 )
 

src/pkg/crypto/block/ecb_aes_test.go

@@ -14,7 +14,6 @@ import (
 	"bytes";
 	"crypto/aes";
 	"io";
-	"os";
 	"testing";
 )
 

src/pkg/crypto/block/ofb_aes_test.go

@@ -14,7 +14,6 @@ import (
 	"bytes";
 	"crypto/aes";
 	"io";
-	"os";
 	"testing";
 )
 

src/pkg/datafmt/datafmt.go

@@ -203,15 +203,12 @@ package datafmt
 
 import (
 	"bytes";
-	"container/vector";
 	"fmt";
 	"go/token";
 	"io";
 	"os";
 	"reflect";
 	"runtime";
-	"strconv";
-	"strings";
 )
 
 

src/pkg/datafmt/datafmt_test.go

@@ -6,7 +6,6 @@ package datafmt
 
 import (
 	"fmt";
-	"os";
 	"strings";
 	"testing";
 )

src/pkg/datafmt/parser.go

@@ -6,7 +6,6 @@ package datafmt
 
 import (
 	"container/vector";
-	"fmt";
 	"go/scanner";
 	"go/token";
 	"os";

src/pkg/debug/dwarf/entry.go

@@ -10,10 +10,7 @@
 
 package dwarf
 
-import (
-	"os";
-	"strconv";
-)
+import "os"
 
 // a single entry's description: a sequence of attributes
 type abbrev struct {

src/pkg/debug/dwarf/open.go

@@ -9,7 +9,6 @@ package dwarf
 
 import (
 	"debug/binary";
-	"fmt";
 	"os";
 )
 

src/pkg/debug/gosym/pclntab.go

@@ -8,10 +8,7 @@
 
 package gosym
 
-import (
-	"debug/binary";
-	"io";
-)
+import "debug/binary"
 
 type LineTable struct {
 	Data []byte;

src/pkg/debug/gosym/pclntab_test.go

@@ -6,8 +6,6 @@ package gosym
 
 import (
 	"debug/elf";
-	"exec";
-	"io";
 	"os";
 	"testing";
 	"syscall";

src/pkg/debug/proc/proc.go

@@ -13,15 +13,15 @@ package proc
 // and proc_darwin.go do, because deps.bash only looks at
 // this file.
 import (
-	"container/vector";
-	"fmt";
-	"io";
+	_ "container/vector";
+	_ "fmt";
+	_ "io";
 	"os";
-	"runtime";
+	_ "runtime";
 	"strconv";
-	"strings";
-	"sync";
-	"syscall";
+	_ "strings";
+	_ "sync";
+	_ "syscall";
 )
 
 type Word uint64

src/pkg/ebnf/ebnf.go

@@ -24,12 +24,9 @@ package ebnf
 
 import (
 	"container/vector";
-	"fmt";
 	"go/scanner";
 	"go/token";
 	"os";
-	"strconv";
-	"strings";
 	"unicode";
 	"utf8";
 )

src/pkg/ebnf/parser.go

@@ -6,14 +6,10 @@ package ebnf
 
 import (
 	"container/vector";
-	"fmt";
 	"go/scanner";
 	"go/token";
 	"os";
 	"strconv";
-	"strings";
-	"unicode";
-	"utf8";
 )
 
 

src/pkg/exvar/exvar.go

@@ -11,7 +11,6 @@ import (
 	"bytes";
 	"fmt";
 	"http";
-	"io";
 	"log";
 	"strconv";
 	"sync";

src/pkg/exvar/exvar_test.go

@@ -5,7 +5,6 @@
 package exvar
 
 import (
-	"fmt";
 	"json";
 	"testing";
 )

src/pkg/flag/flag_test.go

@@ -6,7 +6,6 @@ package flag_test
 
 import (
 	. "flag";
-	"fmt";
 	"testing";
 )
 

src/pkg/fmt/fmt_test.go

@@ -10,7 +10,6 @@ import (
 	"math";
 	"strings";
 	"testing";
-	"unsafe";
 )
 
 func TestFmtInterface(t *testing.T) {

src/pkg/go/ast/scope.go

@@ -4,9 +4,6 @@
 
 package ast
 
-import "go/token";
-
-
 type Scope struct {
 	Outer *Scope;
 	Names map[string]*Ident

src/pkg/go/doc/comment.go

@@ -7,7 +7,6 @@
 package doc
 
 import (
-	"fmt";
 	"go/ast";
 	"io";
 	"once";

src/pkg/go/doc/doc.go

@@ -6,13 +6,10 @@ package doc
 
 import (
 	"container/vector";
-	"fmt";
 	"go/ast";
 	"go/token";
-	"io";
 	"regexp";
 	"sort";
-	"strings";
 )
 
 

src/pkg/go/parser/interface.go

@@ -8,11 +8,9 @@ package parser
 
 import (
 	"bytes";
-	"container/vector";
 	"fmt";
 	"go/ast";
 	"go/scanner";
-	"go/token";
 	"io";
 	"os";
 	pathutil "path";

src/pkg/go/parser/parser.go

@@ -10,15 +10,11 @@
 package parser
 
 import (
-	"bytes";
 	"container/vector";
 	"fmt";
 	"go/ast";
 	"go/scanner";
 	"go/token";
-	"io";
-	"os";
-	"strings";
 )
 
 

src/pkg/go/parser/parser_test.go

@@ -5,7 +5,6 @@
 package parser
 
 import (
-	"go/ast";
 	"os";
 	"testing";
 )

src/pkg/go/printer/printer_test.go

@@ -10,7 +10,6 @@ import (
 	"io";
 	"go/ast";
 	"go/parser";
-	"os";
 	"path";
 	"testing";
 )

src/pkg/gob/decoder.go

@@ -8,7 +8,6 @@ import (
 	"bytes";
 	"io";
 	"os";
-	"reflect";
 	"sync";
 )
 

src/pkg/gob/encode.go

@@ -10,7 +10,6 @@ import (
 	"math";
 	"os";
 	"reflect";
-	"sync";
 	"unsafe";
 )
 

src/pkg/gob/encoder_test.go

@@ -11,7 +11,6 @@ import (
 	"reflect";
 	"strings";
 	"testing";
-	"unsafe";
 )
 
 type ET2 struct {

src/pkg/gob/type.go

@@ -8,9 +8,7 @@ import (
 	"fmt";
 	"os";
 	"reflect";
-	"strings";
 	"sync";
-	"unicode";
 )
 
 type kind reflect.Type

src/pkg/gob/type_test.go

@@ -5,7 +5,6 @@
 package gob
 
 import (
-	"os";
 	"reflect";
 	"testing";
 )

src/pkg/http/client.go

@@ -10,7 +10,6 @@ import (
 	"bufio";
 	"fmt";
 	"io";
-	"log";
 	"net";
 	"os";
 	"strconv";

src/pkg/http/client_test.go

@@ -7,7 +7,6 @@
 package http
 
 import (
-	"fmt";
 	"io";
 	"strings";
 	"testing";

src/pkg/http/request_test.go

@@ -4,11 +4,7 @@
 
 package http
 
-import (
-	"fmt";
-	"os";
-	"testing";
-)
+import "testing"
 
 type stringMultimap map[string] []string
 

src/pkg/io/io.go

@@ -10,7 +10,6 @@
 package io
 
 import (
-	"bytes";
 	"os";
 	"strings";
 )

src/pkg/json/parse.go

@@ -12,10 +12,7 @@ package json
 
 import (
 	"bytes";
-	"fmt";
-	"math";
 	"strconv";
-	"strings";
 	"utf8";
 )
 

src/pkg/net/dialgoogle_test.go

@@ -7,7 +7,6 @@ package net
 import (
 	"flag";
 	"io";
-	"os";
 	"strings";
 	"syscall";
 	"testing";

src/pkg/net/dnsclient.go

@@ -16,7 +16,6 @@
 package net
 
 import (
-	"io";
 	"once";
 	"os";
 	"strings";

src/pkg/net/dnsconfig.go

@@ -6,11 +6,7 @@
 
 package net
 
-import (
-	"io";
-	"os";
-	"strconv";
-)
+import "os"
 
 type _DNS_Config struct {
 	servers []string;	// servers to use

src/pkg/net/net_test.go

@@ -5,7 +5,6 @@
 package net
 
 import (
-	"os";
 	"regexp";
 	"testing";
 )

src/pkg/net/port.go

@@ -7,7 +7,6 @@
 package net
 
 import (
-	"io";
 	"once";
 	"os";
 )

src/pkg/net/server_test.go

@@ -6,7 +6,6 @@ package net
 
 import (
 	"io";
-	"os";
 	"strings";
 	"syscall";
 	"testing";

src/pkg/net/timeout_test.go

@@ -5,7 +5,6 @@
 package net
 
 import (
-	"os";
 	"testing";
 	"time";
 )

src/pkg/os/proc.go

@@ -6,10 +6,7 @@
 
 package os
 
-import (
-	"syscall";
-	"unsafe";
-)
+import "syscall"
 
 var Args []string;	// provided by runtime
 var Envs []string;	// provided by runtime

src/pkg/reflect/type.go

@@ -7,7 +7,6 @@ package reflect
 import (
 	"runtime";
 	"strconv";
-	"strings";
 	"unsafe";
 )
 

src/pkg/rpc/client.go

@@ -12,7 +12,6 @@ import (
 	"log";
 	"net";
 	"os";
-	"strconv";
 	"sync";
 )
 

src/pkg/rpc/debug.go

@@ -11,10 +11,7 @@ package rpc
 
 import (
 	"fmt";
-	"gob";
 	"http";
-	"io";
-	"log";
 	"os";
 	"sort";
 	"template";

src/pkg/rpc/server_test.go

@@ -5,9 +5,7 @@
 package rpc
 
 import (
-	"gob";
 	"http";
-	"io";
 	"log";
 	"net";
 	"once";

src/pkg/strconv/atof_test.go

@@ -5,7 +5,6 @@
 package strconv_test
 
 import (
-	"fmt";
 	"os";
 	"reflect";
 	. "strconv";

src/pkg/strconv/atoi_test.go

@@ -5,7 +5,6 @@
 package strconv_test
 
 import (
-	"fmt";
 	"os";
 	"reflect";
 	. "strconv";

src/pkg/strconv/decimal_test.go

@@ -5,7 +5,6 @@
 package strconv_test
 
 import (
-	"fmt";
 	. "strconv";
 	"testing";
 )

src/pkg/strconv/fp_test.go

@@ -6,7 +6,6 @@ package strconv_test
 import (
 	"bufio";
 	"fmt";
-	"io";
 	"os";
 	"strconv";
 	"strings";

src/pkg/strconv/itoa_test.go

@@ -5,8 +5,6 @@
 package strconv_test
 
 import (
-	"fmt";
-	"os";
 	. "strconv";
 	"testing";
 )

src/pkg/syscall/syscall.go

@@ -11,8 +11,6 @@
 // the manuals for the appropriate operating system.
 package syscall
 
-import "unsafe"
-
 func Syscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr)
 func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, err uintptr)
 func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr)

src/pkg/template/format.go

@@ -10,7 +10,6 @@ import (
 	"bytes";
 	"fmt";
 	"io";
-	"reflect";
 	"strings";
 )
 

src/pkg/template/template_test.go

@@ -9,8 +9,6 @@ import (
 	"container/vector";
 	"fmt";
 	"io";
-	"os";
-	"reflect";
 	"testing";
 )
 

src/pkg/time/sleep.go

@@ -7,7 +7,6 @@ package time
 import (
 	"os";
 	"syscall";
-	"unsafe";
 )
 
 // Sleep pauses the current goroutine for ns nanoseconds.

src/pkg/time/tick.go

@@ -4,11 +4,6 @@
 
 package time
 
-import (
-	"syscall";
-	"unsafe";
-)
-
 // TODO(rsc): This implementation of Tick is a
 // simple placeholder.  Eventually, there will need to be
 // a single central time server no matter how many tickers

src/pkg/utf8/utf8_test.go

@@ -6,7 +6,6 @@ package utf8_test
 
 import (
 	"bytes";
-	"fmt";
 	"strings";
 	"testing";
 	. "utf8";

test/bench/binary-tree-freelist.go

@@ -39,7 +39,6 @@ package main
 import (
 	"flag";
 	"fmt";
-	"os";
 )
 
 var n = flag.Int("n", 15, "depth")

test/bench/binary-tree.go

@@ -39,7 +39,6 @@ package main
 import (
 	"flag";
 	"fmt";
-	"os";
 )
 
 var n = flag.Int("n", 15, "depth")

test/bigalg.go

@@ -6,11 +6,6 @@
 
 package main
 
-import (
-	"fmt";
-	"os";
-)
-
 type T struct {
 	a float64;
 	b int64;

test/fixedbugs/bug106.dir/bug1.go

@@ -4,5 +4,5 @@
 
 package bug1
 
-import "./bug0"
+import _ "./bug0"
 

test/fixedbugs/bug107.go

@@ -6,6 +6,7 @@
 
 package main
 import os "os"
+type _ os.Error
 func f() (os int) {
 	 // In the next line "os" should refer to the result variable, not
 	 // to the package.

test/fixedbugs/bug129.go

@@ -6,7 +6,9 @@
 
 package foo
 import "fmt"
+
 func f() {
+	fmt.Println();
 	fmt := 1;
 	_ = fmt;
 }

test/fixedbugs/bug133.dir/bug2.go

@@ -4,7 +4,7 @@
 
 package bug2
 
-import "./bug1"
+import _ "./bug1"
 import "./bug0"
 
 type T2 struct { t bug0.T }

test/fixedbugs/bug163.go

@@ -6,8 +6,6 @@
 
 package main
 
-import "fmt"
-
 func main() {
 	x⊛y := 1;	// ERROR "identifier"
 }

test/fixedbugs/bug177.go

@@ -5,7 +5,6 @@
 // license that can be found in the LICENSE file.
 
 package main
-import "fmt"
 import "reflect"
 type S1 struct { i int }
 type S2 struct { S1 }

test/fixedbugs/bug188.go

@@ -9,6 +9,7 @@ package main
 import "sort"
 
 func main() {
+	sort.Sort(nil);
 	var x int;
 	sort(x);	// ERROR "package"
 }

test/fixedbugs/bug191.dir/a.go

@@ -7,3 +7,6 @@ package a
 func init() {
 	println("a");
 }
+
+type T int;
+

test/fixedbugs/bug191.dir/b.go

@@ -7,3 +7,5 @@ package b
 func init() {
 	println("b");
 }
+
+type V int;

test/fixedbugs/bug191.go

@@ -9,5 +9,8 @@ package main
 import . "./a"
 import . "./b"
 
+var _ T
+var _ V
+
 func main() {
 }

test/initsyscall.go

@@ -12,7 +12,6 @@
 
 package main
 
-import "log"
 import "time"
 
 func f() {