From 3a7a56cc704eb27b823b6c0dc7bf7b0e7c94d1d7 Mon Sep 17 00:00:00 2001 From: Michael Anthony Knyszek Date: Fri, 9 Nov 2018 23:33:40 +0000 Subject: [PATCH] runtime: gofmt all improperly formatted code This change fixes incorrect formatting in mheap.go (the result of my previous heap scavenging changes) and map_test.go. Change-Id: I2963687504abdc4f0cdf2f0c558174b3bc0ed2df Reviewed-on: https://go-review.googlesource.com/c/148977 Run-TryBot: Michael Knyszek Reviewed-by: Austin Clements TryBot-Result: Gobot Gobot --- src/runtime/map_test.go | 10 +++++----- src/runtime/mheap.go | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/runtime/map_test.go b/src/runtime/map_test.go index 4713ce25ec..93b20668fa 100644 --- a/src/runtime/map_test.go +++ b/src/runtime/map_test.go @@ -435,11 +435,11 @@ func TestEmptyKeyAndValue(t *testing.T) { // ("quick keys") as well as long keys. func TestSingleBucketMapStringKeys_DupLen(t *testing.T) { testMapLookups(t, map[string]string{ - "x": "x1val", - "xx": "x2val", - "foo": "fooval", - "bar": "barval", // same key length as "foo" - "xxxx": "x4val", + "x": "x1val", + "xx": "x2val", + "foo": "fooval", + "bar": "barval", // same key length as "foo" + "xxxx": "x4val", strings.Repeat("x", 128): "longval1", strings.Repeat("y", 128): "longval2", }) diff --git a/src/runtime/mheap.go b/src/runtime/mheap.go index 9b121c63a1..97a0448ad3 100644 --- a/src/runtime/mheap.go +++ b/src/runtime/mheap.go @@ -903,7 +903,7 @@ HaveSpan: // If s was scavenged, then t may be scavenged. start, end := t.physPageBounds() if s.scavenged && start < end { - memstats.heap_released += uint64(end-start) + memstats.heap_released += uint64(end - start) t.scavenged = true } s.state = mSpanManual // prevent coalescing with s @@ -1146,7 +1146,7 @@ func (h *mheap) scavengeLargest(nbytes uintptr) { // // This check also preserves the invariant that spans that have // `scavenged` set are only ever in the `scav` treap, and - // those which have it unset are only in the `free` treap. + // those which have it unset are only in the `free` treap. return } prev := t.pred() @@ -1175,7 +1175,7 @@ func (h *mheap) scavengeAll(now, limit uint64) uintptr { for t != nil { s := t.spanKey next := t.succ() - if (now-uint64(s.unusedsince)) > limit { + if (now - uint64(s.unusedsince)) > limit { r := s.scavenge() if r != 0 { // If we ended up scavenging s, then remove it from unscav -- 2.50.0