- fine-tuning of one-line func heuristic (nodes.go)

- enabled for function declarations (not just function literals)
- applied gofmt -w $GOROOT/src
(look for instance at src/pkg/debug/elf/elf.go)

R=r, rsc
CC=go-dev
http://go/go-review/1026006

2 files changed, 8 insertions, 24 deletions

diff --git a/src/pkg/go/doc/comment.go b/src/pkg/go/doc/comment.go
index 18fce5c4e..75eb7064b 100644
--- a/src/pkg/go/doc/comment.go
+++ b/src/pkg/go/doc/comment.go
@@ -165,9 +165,7 @@ func indentLen(s []byte) int {
 }
 
 
-func isBlank(s []byte) bool {
-	return len(s) == 0 || (len(s) == 1 && s[0] == '\n');
-}
+func isBlank(s []byte) bool	{ return len(s) == 0 || (len(s) == 1 && s[0] == '\n') }
 
 
 func commonPrefix(a, b []byte) []byte {
diff --git a/src/pkg/go/doc/doc.go b/src/pkg/go/doc/doc.go
index 7f8c558e7..d9d436ccb 100644
--- a/src/pkg/go/doc/doc.go
+++ b/src/pkg/go/doc/doc.go
@@ -324,12 +324,8 @@ type ValueDoc struct {
 
 type sortValueDoc []*ValueDoc
 
-func (p sortValueDoc) Len() int {
-	return len(p);
-}
-func (p sortValueDoc) Swap(i, j int) {
-	p[i], p[j] = p[j], p[i];
-}
+func (p sortValueDoc) Len() int		{ return len(p) }
+func (p sortValueDoc) Swap(i, j int)	{ p[i], p[j] = p[j], p[i] }
 
 
 func declName(d *ast.GenDecl) string {
@@ -388,15 +384,9 @@ type FuncDoc struct {
 
 type sortFuncDoc []*FuncDoc
 
-func (p sortFuncDoc) Len() int {
-	return len(p);
-}
-func (p sortFuncDoc) Swap(i, j int) {
-	p[i], p[j] = p[j], p[i];
-}
-func (p sortFuncDoc) Less(i, j int) bool {
-	return p[i].Name < p[j].Name;
-}
+func (p sortFuncDoc) Len() int			{ return len(p) }
+func (p sortFuncDoc) Swap(i, j int)		{ p[i], p[j] = p[j], p[i] }
+func (p sortFuncDoc) Less(i, j int) bool	{ return p[i].Name < p[j].Name }
 
 
 func makeFuncDocs(m map[string]*ast.FuncDecl) []*FuncDoc {
@@ -436,12 +426,8 @@ type TypeDoc struct {
 
 type sortTypeDoc []*TypeDoc
 
-func (p sortTypeDoc) Len() int {
-	return len(p);
-}
-func (p sortTypeDoc) Swap(i, j int) {
-	p[i], p[j] = p[j], p[i];
-}
+func (p sortTypeDoc) Len() int		{ return len(p) }
+func (p sortTypeDoc) Swap(i, j int)	{ p[i], p[j] = p[j], p[i] }
 func (p sortTypeDoc) Less(i, j int) bool {
 	// sort by name
 	// pull blocks (name = "") up to top