diff --git a/src/reflect/export_test.go b/src/reflect/export_test.go
index 1ef63b034f6..82a8a10930a 100644
--- a/src/reflect/export_test.go
+++ b/src/reflect/export_test.go
@@ -34,13 +34,13 @@ func FuncLayout(t Type, rcvr Type) (frametype Type, argSize, retOffset uintptr,
 	for i := uint32(0); i < s.n; i += 2 {
 		stack = append(stack, s.data[i/8]>>(i%8)&3)
 	}
-	if ft.kind & kindGCProg != 0 {
+	if ft.kind&kindGCProg != 0 {
 		panic("can't handle gc programs")
 	}
 	gcdata := (*[1000]byte)(ft.gc[0])
 	for i := uintptr(0); i < ft.size/ptrSize; i++ {
-		gc = append(gc, gcdata[i/2] >> (i%2*4+2) & 3)
+		gc = append(gc, gcdata[i/2]>>(i%2*4+2)&3)
 	}
-	ptrs = ft.kind & kindNoPointers == 0
+	ptrs = ft.kind&kindNoPointers == 0
 	return
 }
diff --git a/src/runtime/hashmap.go b/src/runtime/hashmap.go
index adaf65e419b..077a4dfc986 100644
--- a/src/runtime/hashmap.go
+++ b/src/runtime/hashmap.go
@@ -117,7 +117,7 @@ type hmap struct {
 
 // A bucket for a Go map.
 type bmap struct {
-	tophash  [bucketCnt]uint8
+	tophash [bucketCnt]uint8
 	// Followed by bucketCnt keys and then bucketCnt values.
 	// NOTE: packing all the keys together and then all the values together makes the
 	// code a bit more complicated than alternating key/value/key/value/... but it allows
@@ -150,10 +150,10 @@ func evacuated(b *bmap) bool {
 }
 
 func (b *bmap) overflow(t *maptype) *bmap {
-	return *(**bmap)(add(unsafe.Pointer(b), uintptr(t.bucketsize) - regSize))
+	return *(**bmap)(add(unsafe.Pointer(b), uintptr(t.bucketsize)-regSize))
 }
 func (b *bmap) setoverflow(t *maptype, ovf *bmap) {
-	*(**bmap)(add(unsafe.Pointer(b), uintptr(t.bucketsize) - regSize)) = ovf
+	*(**bmap)(add(unsafe.Pointer(b), uintptr(t.bucketsize)-regSize)) = ovf
 }
 
 func makemap(t *maptype, hint int64) *hmap {