fix "declared and not used" in tests;

also template/template.go, missed last time.

R=r
DELTA=116  (61 added, 10 deleted, 45 changed)
OCL=34620
CL=34622

1 files changed, 16 insertions, 11 deletions

diff --git a/test/if.go b/test/if.go
index a2c840eb1..c7f14c42a 100644
--- a/test/if.go
+++ b/test/if.go
@@ -21,56 +21,57 @@ func main() {
 
 	count = 0;
 	if true {
-		count = count + 1;	
+		count = count + 1;
 	}
 	assertequal(count, 1, "if true");
 
 	count = 0;
 	if false {
-		count = count + 1;	
+		count = count + 1;
 	}
 	assertequal(count, 0, "if false");
 
 	count = 0;
 	if one := 1; true {
-		count = count + one;	
+		count = count + one;
 	}
 	assertequal(count, 1, "if true one");
 
 	count = 0;
 	if one := 1; false {
-		count = count + 1;	
+		count = count + 1;
+		_ = one;
 	}
 	assertequal(count, 0, "if false one");
 
 	count = 0;
 	if {
-		count = count + 1;	
+		count = count + 1;
 	}
 	assertequal(count, 1, "if empty");
 
 	count = 0;
 	if one := 1; true {
-		count = count + one;	
+		count = count + one;
 	}
 	assertequal(count, 1, "if empty one");
 
 	count = 0;
 	if i5 < i7 {
-		count = count + 1;	
+		count = count + 1;
 	}
 	assertequal(count, 1, "if cond");
 
 	count = 0;
 	if true {
-		count = count + 1;	
+		count = count + 1;
 	} else
 		count = count - 1;
 	assertequal(count, 1, "if else true");
 
 	count = 0;
 	if false {
-		count = count + 1;	
+		count = count + 1;
 	} else
 		count = count - 1;
 	assertequal(count, -1, "if else false");
@@ -78,7 +79,9 @@ func main() {
 	count = 0;
 	if t:=1; false {
 		count = count + 1;
-		t := 7;	
+		_ = t;
+		t := 7;
+		_ = t;
 	} else
 		count = count - t;
 	assertequal(count, -1, "if else false var");
@@ -87,8 +90,10 @@ func main() {
 	t := 1;
 	if false {
 		count = count + 1;
-		t := 7;	
+		t := 7;
+		_ = t;
 	} else
 		count = count - t;
+	_ = t;
 	assertequal(count, -1, "if else false var outside");
 }