- 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, 5 insertions, 7 deletions

diff --git a/src/pkg/template/template.go b/src/pkg/template/template.go
index c647a2d37..728b7a529 100644
--- a/src/pkg/template/template.go
+++ b/src/pkg/template/template.go
@@ -72,9 +72,7 @@ type Error struct {
 	Msg	string;
 }
 
-func (e *Error) String() string {
-	return fmt.Sprintf("line %d: %s", e.Line, e.Msg);
-}
+func (e *Error) String() string	{ return fmt.Sprintf("line %d: %s", e.Line, e.Msg) }
 
 // Most of the literals are aces.
 var lbrace = []byte{'{'}
@@ -196,9 +194,7 @@ func (t *Template) parseError(err string, args ...) {
 // -- Lexical analysis
 
 // Is c a white space character?
-func white(c uint8) bool {
-	return c == ' ' || c == '\t' || c == '\r' || c == '\n';
-}
+func white(c uint8) bool	{ return c == ' ' || c == '\t' || c == '\r' || c == '\n' }
 
 // Safely, does s[n:n+len(t)] == t?
 func equal(s []byte, n int, t []byte) bool {
diff --git a/src/pkg/template/template_test.go b/src/pkg/template/template_test.go
index becfa0f0b..6fbc14726 100644
--- a/src/pkg/template/template_test.go
+++ b/src/pkg/template/template_test.go
@@ -59,7 +59,9 @@ func plus1(v interface{}) string {
 }
 
 func writer(f func(interface{}) string) (func(io.Writer, interface{}, string)) {
-	return func(w io.Writer, v interface{}, format string) { io.WriteString(w, f(v)) };
+	return func(w io.Writer, v interface{}, format string) {
+		io.WriteString(w, f(v));
+	};
 }