mirror of
https://github.com/gohugoio/hugo.git
synced 2025-08-31 22:41:53 +02:00
Pull in the latest code from Go's template packages (#11771)
Fixes #10707 Fixes #11507
This commit is contained in:
committed by
GitHub
parent
14d85ec136
commit
9f978d387f
@@ -6,13 +6,14 @@ package fmtsort_test
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/gohugoio/hugo/tpl/internal/go_templates/fmtsort"
|
||||
"math"
|
||||
"reflect"
|
||||
"sort"
|
||||
"strings"
|
||||
"testing"
|
||||
"unsafe"
|
||||
|
||||
"github.com/gohugoio/hugo/tpl/internal/go_templates/fmtsort"
|
||||
)
|
||||
|
||||
var compareTests = [][]reflect.Value{
|
||||
@@ -38,7 +39,7 @@ var compareTests = [][]reflect.Value{
|
||||
ct(reflect.TypeOf(chans[0]), chans[0], chans[1], chans[2]),
|
||||
ct(reflect.TypeOf(toy{}), toy{0, 1}, toy{0, 2}, toy{1, -1}, toy{1, 1}),
|
||||
ct(reflect.TypeOf([2]int{}), [2]int{1, 1}, [2]int{1, 2}, [2]int{2, 0}),
|
||||
ct(reflect.TypeOf(any(any(0))), iFace, 1, 2, 3),
|
||||
ct(reflect.TypeOf(any(0)), iFace, 1, 2, 3),
|
||||
}
|
||||
|
||||
var iFace any
|
||||
@@ -190,12 +191,15 @@ func sprintKey(key reflect.Value) string {
|
||||
var (
|
||||
ints [3]int
|
||||
chans = makeChans()
|
||||
// pin runtime.Pinner
|
||||
)
|
||||
|
||||
func makeChans() []chan int {
|
||||
cs := []chan int{make(chan int), make(chan int), make(chan int)}
|
||||
// Order channels by address. See issue #49431.
|
||||
// TODO: pin these pointers once pinning is available (#46787).
|
||||
for i := range cs {
|
||||
reflect.ValueOf(cs[i]).UnsafePointer()
|
||||
}
|
||||
sort.Slice(cs, func(i, j int) bool {
|
||||
return uintptr(reflect.ValueOf(cs[i]).UnsafePointer()) < uintptr(reflect.ValueOf(cs[j]).UnsafePointer())
|
||||
})
|
||||
|
Reference in New Issue
Block a user