Commit f9489bed authored by Rob Pike's avatar Rob Pike

renaming_4: gofix -r everything/but/src/pkg

R=rsc
CC=golang-dev
https://golang.org/cl/5338043
parent 45e3bcb3
......@@ -2,10 +2,10 @@ package main
import (
"errors"
"http"
"io/ioutil"
"net/http"
"regexp"
"template"
"text/template"
)
type Page struct {
......
package main
import (
"http"
"io/ioutil"
"template"
"net/http"
"text/template"
)
type Page struct {
......
package main
import (
"http"
"io/ioutil"
"net/http"
"regexp"
"template"
"text/template"
)
type Page struct {
......
package main
import (
"http"
"io/ioutil"
"template"
"net/http"
"text/template"
)
type Page struct {
......
package main
import (
"http"
"io/ioutil"
"net/http"
"regexp"
"template"
"text/template"
)
type Page struct {
......
package main
import (
"http"
"flag"
"fmt"
"io"
"log"
"net"
"net/http"
"os"
"strings"
)
......
package main
import (
"template"
"os"
"io/ioutil"
"os"
"text/template"
)
func main() {
......
......@@ -2,7 +2,7 @@ package main
import (
"fmt"
"http"
"net/http"
)
func handler(w http.ResponseWriter, r *http.Request) {
......
......@@ -237,7 +237,7 @@ package main
import (
"fmt"
"http"
"net/http"
)
func handler(w http.ResponseWriter, r *http.Request) {
......
......@@ -2,8 +2,8 @@ package main
import (
"fmt"
"http"
"io/ioutil"
"net/http"
)
type Page struct {
......
......@@ -2,8 +2,8 @@ package main
import (
"fmt"
"http"
"io/ioutil"
"net/http"
)
type Page struct {
......
......@@ -3,13 +3,13 @@ package main
import (
"bytes"
"flag"
"go/ast"
"go/parser"
"go/printer"
"go/ast"
"go/token"
"log"
"template"
"os"
"text/template"
)
var (
......
......@@ -50,8 +50,8 @@ import (
"flag"
"fmt"
"io"
"math/rand"
"os"
"rand"
"strings"
"time"
)
......
......@@ -6,7 +6,7 @@ package main
import (
"fmt"
"rand"
"math/rand"
)
const (
......
......@@ -5,8 +5,8 @@
package main
import (
"http"
"log"
"net/http"
"time"
)
......
......@@ -2,9 +2,9 @@ package main
import (
"flag"
"http"
"log"
"template"
"net/http"
"text/template"
)
var addr = flag.String("addr", ":1718", "http service address") // Q=17, R=18
......
......@@ -8,7 +8,7 @@ import (
"container/heap"
"flag"
"fmt"
"rand"
"math/rand"
"time"
)
......
......@@ -27,7 +27,7 @@ import (
"os"
"regexp"
"strings"
"template"
"text/template"
)
func Usage() {
......
......@@ -6,10 +6,10 @@ package main
import (
"bytes"
"exec"
"io"
"log"
"os"
"os/exec"
"strings"
)
......
......@@ -6,13 +6,13 @@ package main
import (
"bytes"
"encoding/json"
"errors"
"fmt"
"http"
"json"
"log"
"net/http"
"net/url"
"strconv"
"url"
)
type param map[string]string
......
......@@ -5,6 +5,7 @@
package main
import (
"encoding/xml"
"errors"
"flag"
"fmt"
......@@ -17,7 +18,6 @@ import (
"strconv"
"strings"
"time"
"xml"
)
const (
......
......@@ -5,16 +5,16 @@
package main
import (
"exec"
"flag"
"http"
"io"
"io/ioutil"
"log"
"net/http"
"os"
"os/exec"
"runtime"
"strconv"
"template"
"text/template"
)
var (
......
......@@ -5,11 +5,11 @@
package main
import (
"exec"
"fmt"
"go/token"
"io/ioutil"
"os"
"os/exec"
)
// run runs the command argv, feeding in stdin on standard input.
......
......@@ -10,7 +10,7 @@ import (
"io"
"os"
"strings"
"template"
"text/template"
)
// A Command is an implementation of a go command
......
......@@ -9,8 +9,8 @@ package main
import (
"archive/zip"
"http"
"log"
"net/http"
"path"
)
......
......@@ -13,19 +13,19 @@
package main
import (
"encoding/xml"
"errors"
"fmt"
"http"
"io"
"log"
"net/http"
"os"
"regexp"
"sort"
"strconv"
"strings"
"template"
"utf8"
"xml"
"text/template"
"unicode/utf8"
)
// Handler for /doc/codewalk/ and below.
......
......@@ -17,7 +17,7 @@ import (
"io"
"regexp"
"strconv"
"template"
"text/template"
)
// ----------------------------------------------------------------------------
......
......@@ -13,9 +13,9 @@ import (
"go/doc"
"go/printer"
"go/token"
"http"
"io"
"log"
"net/http"
"os"
"path"
"path/filepath"
......@@ -23,7 +23,7 @@ import (
"runtime"
"sort"
"strings"
"template"
"text/template"
"time"
)
......
......@@ -26,8 +26,8 @@ package main
import (
"archive/zip"
"fmt"
"http"
"io"
"net/http"
"os"
"path"
"sort"
......
......@@ -40,12 +40,12 @@ package main
import (
"bufio"
"bytes"
"encoding/gob"
"errors"
"go/ast"
"go/parser"
"go/scanner"
"go/token"
"gob"
"index/suffixarray"
"io"
"path/filepath"
......
......@@ -34,10 +34,11 @@ import (
"fmt"
"go/ast"
"go/build"
"http"
_ "http/pprof" // to serve /debug/pprof/*
"io"
"log"
"net/http"
_ "net/http/pprof" // to serve /debug/pprof/*
"net/url"
"os"
"path"
"path/filepath"
......@@ -45,7 +46,6 @@ import (
"runtime"
"strings"
"time"
"url"
)
const defaultAddr = ":6060" // default webserver address
......
......@@ -14,7 +14,7 @@ import (
"bytes"
"fmt"
"io"
"scanner"
"text/scanner"
)
type ebnfParser struct {
......
......@@ -15,7 +15,7 @@ import (
"strings"
"sync"
"time"
"utf8"
"unicode/utf8"
)
// An RWValue wraps a value and permits mutually exclusive
......
......@@ -6,7 +6,6 @@ package main
import (
"bytes"
"exec"
"flag"
"fmt"
"go/ast"
......@@ -16,6 +15,7 @@ import (
"go/token"
"io/ioutil"
"os"
"os/exec"
"path/filepath"
"sort"
"strings"
......
......@@ -6,7 +6,6 @@ package main
import (
"bytes"
"exec"
"flag"
"fmt"
"go/ast"
......@@ -17,6 +16,7 @@ import (
"io"
"io/ioutil"
"os"
"os/exec"
"path/filepath"
"runtime/pprof"
"strings"
......
......@@ -13,7 +13,7 @@ import (
"reflect"
"strings"
"unicode"
"utf8"
"unicode/utf8"
)
func initRewrite() {
......
......@@ -8,12 +8,12 @@ package main
import (
"bytes"
"encoding/json"
"errors"
"exec"
"fmt"
"http"
"json"
"net/http"
"os"
"os/exec"
"path/filepath"
"regexp"
"runtime"
......
......@@ -7,13 +7,13 @@ package main
import (
"bytes"
"errors"
"exec"
"flag"
"fmt"
"go/build"
"go/token"
"io/ioutil"
"os"
"os/exec"
"path/filepath" // use for file system paths
"regexp"
"runtime"
......
......@@ -12,7 +12,7 @@ import (
"go/build"
"path" // use for import paths
"strings"
"template"
"text/template"
)
// domake builds the package in dir.
......
......@@ -6,7 +6,6 @@ package main
import (
"bufio"
"exec"
"fmt"
"go/ast"
"go/build"
......@@ -15,12 +14,13 @@ import (
"go/token"
"io/ioutil"
"os"
"os/exec"
"runtime"
"sort"
"strings"
"time"
"unicode"
"utf8"
"unicode/utf8"
)
// Environment for commands.
......
......@@ -20,7 +20,7 @@ import (
"reflect"
"strconv"
"strings"
"utf8"
"unicode/utf8"
)
var verbose = flag.Bool("v", false, "verbose")
......
......@@ -6,11 +6,11 @@ package main
import (
"bytes"
"exec"
"flag"
"fmt"
"io/ioutil"
"os"
"os/exec"
"patch"
"path/filepath"
"sort"
......
......@@ -11,25 +11,25 @@ package main
import (
"fmt"
"utf8"
"unicode/utf8"
)
func f(byte) {}
func f(byte) {}
func g(uint8) {}
func main() {
var x float64
f(x) // ERROR "byte"
g(x) // ERROR "uint8"
f(x) // ERROR "byte"
g(x) // ERROR "uint8"
// Test across imports.
var ff fmt.Formatter
var fs fmt.State
ff.Format(fs, x) // ERROR "rune"
ff.Format(fs, x) // ERROR "rune"
utf8.RuneStart(x) // ERROR "byte"
utf8.RuneStart(x) // ERROR "byte"
var s utf8.String
s.At(x) // ERROR "int"
s.At(x) // ERROR "int"
}
......@@ -38,9 +38,9 @@ POSSIBILITY OF SUCH DAMAGE.
package main
import (
"big"
"flag"
"fmt"
"math/big"
)
var n = flag.Int("n", 27, "number of digits")
......
......@@ -18,7 +18,7 @@ import (
"fmt"
"io"
"os"
"template"
"text/template"
)
func main() {
......
......@@ -9,14 +9,14 @@
package main
import (
"cmath"
"fmt"
"math"
"math/cmplx"
)
type Test struct{
f, g complex128
out complex128
type Test struct {
f, g complex128
out complex128
}
var nan = math.NaN()
......@@ -25,9 +25,9 @@ var negzero = math.Copysign(0, -1)
func calike(a, b complex128) bool {
switch {
case cmath.IsInf(a) && cmath.IsInf(b):
case cmplx.IsInf(a) && cmplx.IsInf(b):
return true
case cmath.IsNaN(a) && cmath.IsNaN(b):
case cmplx.IsNaN(a) && cmplx.IsNaN(b):
return true
}
return a == b
......@@ -36,7 +36,7 @@ func calike(a, b complex128) bool {
func main() {
bad := false
for _, t := range tests {
x := t.f/t.g
x := t.f / t.g
if !calike(x, t.out) {
if !bad {
fmt.Printf("BUG\n")
......
......@@ -12,14 +12,14 @@ import (
"go/ast"
"go/parser"
"go/token"
"log"
"net/http"
_ "net/http/pprof"
"os"
"path"
"runtime"
"strings"
"time"
"http"
_ "http/pprof"
"log"
)
var serve = flag.String("serve", "", "serve http on this address at end")
......
......@@ -6,7 +6,7 @@
package main
import "rand"
import "math/rand"
const Count = 1e5
......
......@@ -6,7 +6,7 @@
package main
import "rand"
import "math/rand"
const Count = 1e5
......
......@@ -10,7 +10,7 @@ package main
import (
"flag"
"rand"
"math/rand"
"runtime"
"unsafe"
)
......
......@@ -9,7 +9,7 @@ package main
import (
"fmt"
"os"
"utf8"
"unicode/utf8"
)
func main() {
......
......@@ -6,7 +6,7 @@
package main
import "utf8"
import "unicode/utf8"
func main() {
var chars [6]rune
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment