From 2fa7c464f019f67c5c0494aaf5ac0f5ecc1ee7a7 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Tue, 16 Jan 2018 12:03:31 -0500
Subject: Updated dependencies and added avct/uasurfer (#8089)

* Updated dependencies and added avct/uasurfer

* Added uasurfer to NOTICE.txt
---
 .../golang.org/x/text/collate/tools/colcmp/darwin.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'vendor/golang.org/x/text/collate/tools/colcmp/darwin.go')

diff --git a/vendor/golang.org/x/text/collate/tools/colcmp/darwin.go b/vendor/golang.org/x/text/collate/tools/colcmp/darwin.go
index c2c31d5cb..d2300e3e2 100644
--- a/vendor/golang.org/x/text/collate/tools/colcmp/darwin.go
+++ b/vendor/golang.org/x/text/collate/tools/colcmp/darwin.go
@@ -39,13 +39,13 @@ type osxCollator struct {
 
 func (c *osxCollator) init(locale string) {
 	l := C.CFStringCreateWithBytes(
-		nil,
+		C.kCFAllocatorDefault,
 		osxUInt8P([]byte(locale)),
 		C.CFIndex(len(locale)),
 		C.kCFStringEncodingUTF8,
 		C.Boolean(0),
 	)
-	c.loc = C.CFLocaleCreate(nil, l)
+	c.loc = C.CFLocaleCreate(C.kCFAllocatorDefault, l)
 }
 
 func newOSX8Collator(locale string) (Collator, error) {
@@ -74,16 +74,16 @@ type osx16Collator struct {
 
 func (c osx16Collator) Compare(a, b Input) int {
 	sa := C.CFStringCreateWithCharactersNoCopy(
-		nil,
+		C.kCFAllocatorDefault,
 		osxCharP(a.UTF16),
 		C.CFIndex(len(a.UTF16)),
-		nil,
+		C.kCFAllocatorDefault,
 	)
 	sb := C.CFStringCreateWithCharactersNoCopy(
-		nil,
+		C.kCFAllocatorDefault,
 		osxCharP(b.UTF16),
 		C.CFIndex(len(b.UTF16)),
-		nil,
+		C.kCFAllocatorDefault,
 	)
 	_range := C.CFRangeMake(0, C.CFStringGetLength(sa))
 	return int(C.CFStringCompareWithOptionsAndLocale(sa, sb, _range, c.opt, c.loc))
@@ -91,20 +91,20 @@ func (c osx16Collator) Compare(a, b Input) int {
 
 func (c osx8Collator) Compare(a, b Input) int {
 	sa := C.CFStringCreateWithBytesNoCopy(
-		nil,
+		C.kCFAllocatorDefault,
 		osxUInt8P(a.UTF8),
 		C.CFIndex(len(a.UTF8)),
 		C.kCFStringEncodingUTF8,
 		C.Boolean(0),
-		nil,
+		C.kCFAllocatorDefault,
 	)
 	sb := C.CFStringCreateWithBytesNoCopy(
-		nil,
+		C.kCFAllocatorDefault,
 		osxUInt8P(b.UTF8),
 		C.CFIndex(len(b.UTF8)),
 		C.kCFStringEncodingUTF8,
 		C.Boolean(0),
-		nil,
+		C.kCFAllocatorDefault,
 	)
 	_range := C.CFRangeMake(0, C.CFStringGetLength(sa))
 	return int(C.CFStringCompareWithOptionsAndLocale(sa, sb, _range, c.opt, c.loc))
-- 
cgit v1.2.3-1-g7c22