From 0d171ba1d81886c6f9caf61867129e6daa268cd6 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Tue, 15 Aug 2017 01:10:41 +0900 Subject: Remove special nilItem --- src/merger.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/merger.go') diff --git a/src/merger.go b/src/merger.go index 7d30a76e..d710f2a2 100644 --- a/src/merger.go +++ b/src/merger.go @@ -29,7 +29,7 @@ func PassMerger(chunks *[]*Chunk, tac bool) *Merger { count: 0} for _, chunk := range *mg.chunks { - mg.count += len(*chunk) + mg.count += chunk.count } return &mg } @@ -65,7 +65,7 @@ func (mg *Merger) Get(idx int) Result { idx = mg.count - idx - 1 } chunk := (*mg.chunks)[idx/chunkSize] - return Result{item: &(*chunk)[idx%chunkSize]} + return Result{item: &chunk.items[idx%chunkSize]} } if mg.sorted { -- cgit v1.2.3