phonenumberutil: update package references

Updates #105.

Gopkg.toml

@@ -26,7 +26,7 @@
 
 
 [[constraint]]
-  name = "github.com/golang/protobuf"
+  name = "google.golang.org/protobuf"
   version = "1.0.0"
 
 [[constraint]]

phonenumberutil.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/ttacon/builder"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 const (
@@ -2560,7 +2560,7 @@ func maybeExtractCountryCode(
 		}
 		potentialCountryCode := extractCountryCode(fullNumber, nationalNumber)
 		if potentialCountryCode != 0 {
-			phoneNumber.CountryCode = proto.Int(potentialCountryCode)
+			phoneNumber.CountryCode = proto.Int32(int32(potentialCountryCode))
 			return potentialCountryCode, nil
 		}
 
@@ -2610,13 +2610,13 @@ func maybeExtractCountryCode(
 					val := PhoneNumber_FROM_NUMBER_WITHOUT_PLUS_SIGN
 					phoneNumber.CountryCodeSource = &val
 				}
-				phoneNumber.CountryCode = proto.Int(defaultCountryCode)
+				phoneNumber.CountryCode = proto.Int32(int32(defaultCountryCode))
 				return defaultCountryCode, nil
 			}
 		}
 	}
 	// No country calling code present.
-	phoneNumber.CountryCode = proto.Int(0)
+	phoneNumber.CountryCode = proto.Int32(0)
 	return 0, nil
 }
 
@@ -2867,7 +2867,7 @@ func setItalianLeadingZerosForPhoneNumber(
 		numLeadZeros++
 	}
 	if numLeadZeros != 1 {
-		phoneNumber.NumberOfLeadingZeros = proto.Int(numLeadZeros)
+		phoneNumber.NumberOfLeadingZeros = proto.Int32(int32(numLeadZeros))
 	}
 }
 
@@ -2958,7 +2958,7 @@ func parseHelper(
 		normalizedNationalNumber.WriteString(normalize(nationalNumber.String()))
 		if len(defaultRegion) != 0 {
 			countryCode = int(regionMetadata.GetCountryCode())
-			phoneNumber.CountryCode = proto.Int(countryCode)
+			phoneNumber.CountryCode = proto.Int32(int32(countryCode))
 		} else if keepRawInput {
 			phoneNumber.CountryCodeSource = nil
 		}
@@ -3130,7 +3130,7 @@ func isNumberMatchWithNumbers(firstNumberIn, secondNumberIn *PhoneNumber) MatchT
 	// Checks cases where one or both country_code fields were not
 	// specified. To make equality checks easier, we first set the
 	// country_code fields to be equal.
-	firstNumber.CountryCode = proto.Int(int(secondNumberCountryCode))
+	firstNumber.CountryCode = proto.Int32(secondNumberCountryCode)
 	// If all else was the same, then this is an NSN_MATCH.
 	// TODO(ttacon): remove when make gen-equals
 	if reflect.DeepEqual(firstNumber, secondNumber) {

phonenumberutil_test.go

@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 func TestParse(t *testing.T) {
@@ -273,8 +273,8 @@ func Test_IsValidNumber(t *testing.T) {
 			continue
 		}
 		if IsValidNumber(num) != test.isValid {
-			t.Errorf("[test %d:validity] failed: %v != %v\n",
-				i, IsValidNumber(num), test.isValid)
+			t.Errorf("[test %d:validity] failed: IsValidNumber(%v) = %v, want %v\n",
+				i, num, IsValidNumber(num), test.isValid)
 		}
 	}
 }
@@ -566,9 +566,9 @@ var testPhoneNumbers = map[string]*PhoneNumber{
 	"UNKNOWN_COUNTRY_CODE_NO_RAW_INPUT": newPhoneNumber(2, 12345),
 }
 
-func newPhoneNumber(cc int, natNum uint64) *PhoneNumber {
+func newPhoneNumber(cc int32, natNum uint64) *PhoneNumber {
 	p := &PhoneNumber{}
-	p.CountryCode = proto.Int(cc)
+	p.CountryCode = proto.Int32(cc)
 	p.NationalNumber = proto.Uint64(natNum)
 	return p
 }