瀏覽代碼

Merge pull request #1948 from slingamn/reverse_again

remove history.ReverseCorrespondents in favor of generics
tags/v2.10.0-rc1
Shivaram Lingamneni 2 年之前
父節點
當前提交
dea2e7961a
No account linked to committer's email address
共有 3 個文件被更改,包括 7 次插入12 次删除
  1. 1
    1
      irc/history/history.go
  2. 5
    10
      irc/history/targets.go
  3. 1
    1
      irc/mysql/history.go

+ 1
- 1
irc/history/history.go 查看文件

262
 	}
262
 	}
263
 
263
 
264
 	if !ascending {
264
 	if !ascending {
265
-		ReverseCorrespondents(results)
265
+		utils.ReverseSlice(results)
266
 	}
266
 	}
267
 
267
 
268
 	return
268
 	return

+ 5
- 10
irc/history/targets.go 查看文件

6
 import (
6
 import (
7
 	"sort"
7
 	"sort"
8
 	"time"
8
 	"time"
9
+
10
+	"github.com/ergochat/ergo/irc/utils"
9
 )
11
 )
10
 
12
 
11
 type TargetListing struct {
13
 type TargetListing struct {
33
 	results = make([]TargetListing, 0, prealloc)
35
 	results = make([]TargetListing, 0, prealloc)
34
 
36
 
35
 	if !ascending {
37
 	if !ascending {
36
-		ReverseCorrespondents(base)
37
-		ReverseCorrespondents(extra)
38
+		utils.ReverseSlice(base)
39
+		utils.ReverseSlice(extra)
38
 	}
40
 	}
39
 
41
 
40
 	for len(results) < limit {
42
 	for len(results) < limit {
64
 	}
66
 	}
65
 
67
 
66
 	if !ascending {
68
 	if !ascending {
67
-		ReverseCorrespondents(results)
69
+		utils.ReverseSlice(results)
68
 	}
70
 	}
69
 	return
71
 	return
70
 }
72
 }
71
 
73
 
72
-func ReverseCorrespondents(results []TargetListing) {
73
-	// lol, generics when?
74
-	for i, j := 0, len(results)-1; i < j; i, j = i+1, j-1 {
75
-		results[i], results[j] = results[j], results[i]
76
-	}
77
-}
78
-
79
 func SortCorrespondents(list []TargetListing) {
74
 func SortCorrespondents(list []TargetListing) {
80
 	sort.Slice(list, func(i, j int) bool {
75
 	sort.Slice(list, func(i, j int) bool {
81
 		return list[i].Time.Before(list[j].Time)
76
 		return list[i].Time.Before(list[j].Time)

+ 1
- 1
irc/mysql/history.go 查看文件

964
 	}
964
 	}
965
 
965
 
966
 	if !ascending {
966
 	if !ascending {
967
-		history.ReverseCorrespondents(results)
967
+		utils.ReverseSlice(results)
968
 	}
968
 	}
969
 
969
 
970
 	return
970
 	return

Loading…
取消
儲存