diff options
| author | Robert Griesemer <gri@golang.org> | 2009-12-15 15:40:16 -0800 |
|---|---|---|
| committer | Robert Griesemer <gri@golang.org> | 2009-12-15 15:40:16 -0800 |
| commit | 13ac778ef2f757c7cd636b4336a2bd6c8f403b43 (patch) | |
| tree | 28b6ebc4aa762e38c45f4b0b69d3aee472ed4c3c /src/pkg/rpc/debug.go | |
| parent | e4bd81f903362d998f7bfc02095935408aff0bc5 (diff) | |
| download | golang-13ac778ef2f757c7cd636b4336a2bd6c8f403b43.tar.gz | |
1) Change default gofmt default settings for
parsing and printing to new syntax.
Use -oldparser to parse the old syntax,
use -oldprinter to print the old syntax.
2) Change default gofmt formatting settings
to use tabs for indentation only and to use
spaces for alignment. This will make the code
alignment insensitive to an editor's tabwidth.
Use -spaces=false to use tabs for alignment.
3) Manually changed src/exp/parser/parser_test.go
so that it doesn't try to parse the parser's
source files using the old syntax (they have
new syntax now).
4) gofmt -w src misc test/bench
4th set of files.
R=rsc
CC=golang-dev
http://codereview.appspot.com/180049
Diffstat (limited to 'src/pkg/rpc/debug.go')
| -rw-r--r-- | src/pkg/rpc/debug.go | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/pkg/rpc/debug.go b/src/pkg/rpc/debug.go index 7ba74a5e0..638584f49 100644 --- a/src/pkg/rpc/debug.go +++ b/src/pkg/rpc/debug.go @@ -10,10 +10,10 @@ package rpc */ import ( - "fmt"; - "http"; - "sort"; - "template"; + "fmt" + "http" + "sort" + "template" ) const debugText = `<html> @@ -39,47 +39,47 @@ const debugText = `<html> var debug = template.MustParse(debugText, nil) type debugMethod struct { - m *methodType; - name string; + m *methodType + name string } type methodArray []debugMethod type debugService struct { - s *service; - name string; - meth methodArray; + s *service + name string + meth methodArray } type serviceArray []debugService -func (s serviceArray) Len() int { return len(s) } -func (s serviceArray) Less(i, j int) bool { return s[i].name < s[j].name } -func (s serviceArray) Swap(i, j int) { s[i], s[j] = s[j], s[i] } +func (s serviceArray) Len() int { return len(s) } +func (s serviceArray) Less(i, j int) bool { return s[i].name < s[j].name } +func (s serviceArray) Swap(i, j int) { s[i], s[j] = s[j], s[i] } -func (m methodArray) Len() int { return len(m) } -func (m methodArray) Less(i, j int) bool { return m[i].name < m[j].name } -func (m methodArray) Swap(i, j int) { m[i], m[j] = m[j], m[i] } +func (m methodArray) Len() int { return len(m) } +func (m methodArray) Less(i, j int) bool { return m[i].name < m[j].name } +func (m methodArray) Swap(i, j int) { m[i], m[j] = m[j], m[i] } // Runs at /debug/rpc func debugHTTP(c *http.Conn, req *http.Request) { // Build a sorted version of the data. - var services = make(serviceArray, len(server.serviceMap)); - i := 0; - server.Lock(); + var services = make(serviceArray, len(server.serviceMap)) + i := 0 + server.Lock() for sname, service := range server.serviceMap { - services[i] = debugService{service, sname, make(methodArray, len(service.method))}; - j := 0; + services[i] = debugService{service, sname, make(methodArray, len(service.method))} + j := 0 for mname, method := range service.method { - services[i].meth[j] = debugMethod{method, mname}; - j++; + services[i].meth[j] = debugMethod{method, mname} + j++ } - sort.Sort(services[i].meth); - i++; + sort.Sort(services[i].meth) + i++ } - server.Unlock(); - sort.Sort(services); - err := debug.Execute(services, c); + server.Unlock() + sort.Sort(services) + err := debug.Execute(services, c) if err != nil { fmt.Fprintln(c, "rpc: error executing template:", err.String()) } |