VOL-1967 move api-server to separate repository
Change-Id: I21b85be74205805be15f8a85e53a903d16785671
diff --git a/vendor/golang.org/x/text/language/coverage.go b/vendor/golang.org/x/text/language/coverage.go
index 101fd23..a24fd1a 100644
--- a/vendor/golang.org/x/text/language/coverage.go
+++ b/vendor/golang.org/x/text/language/coverage.go
@@ -7,6 +7,8 @@
import (
"fmt"
"sort"
+
+ "golang.org/x/text/internal/language"
)
// The Coverage interface is used to define the level of coverage of an
@@ -44,9 +46,9 @@
// consecutive range, it simply returns a slice of numbers in increasing order.
// The "undefined" region is not returned.
func (s allSubtags) Regions() []Region {
- reg := make([]Region, numRegions)
+ reg := make([]Region, language.NumRegions)
for i := range reg {
- reg[i] = Region{regionID(i + 1)}
+ reg[i] = Region{language.Region(i + 1)}
}
return reg
}
@@ -55,9 +57,9 @@
// consecutive range, it simply returns a slice of numbers in increasing order.
// The "undefined" script is not returned.
func (s allSubtags) Scripts() []Script {
- scr := make([]Script, numScripts)
+ scr := make([]Script, language.NumScripts)
for i := range scr {
- scr[i] = Script{scriptID(i + 1)}
+ scr[i] = Script{language.Script(i + 1)}
}
return scr
}
@@ -65,22 +67,10 @@
// BaseLanguages returns the list of all supported base languages. It generates
// the list by traversing the internal structures.
func (s allSubtags) BaseLanguages() []Base {
- base := make([]Base, 0, numLanguages)
- for i := 0; i < langNoIndexOffset; i++ {
- // We included "und" already for the value 0.
- if i != nonCanonicalUnd {
- base = append(base, Base{langID(i)})
- }
- }
- i := langNoIndexOffset
- for _, v := range langNoIndex {
- for k := 0; k < 8; k++ {
- if v&1 == 1 {
- base = append(base, Base{langID(i)})
- }
- v >>= 1
- i++
- }
+ bs := language.BaseLanguages()
+ base := make([]Base, len(bs))
+ for i, b := range bs {
+ base[i] = Base{b}
}
return base
}
@@ -90,7 +80,7 @@
return nil
}
-// coverage is used used by NewCoverage which is used as a convenient way for
+// coverage is used by NewCoverage which is used as a convenient way for
// creating Coverage implementations for partially defined data. Very often a
// package will only need to define a subset of slices. coverage provides a
// convenient way to do this. Moreover, packages using NewCoverage, instead of
@@ -134,7 +124,7 @@
}
a := make([]Base, len(tags))
for i, t := range tags {
- a[i] = Base{langID(t.lang)}
+ a[i] = Base{language.Language(t.lang())}
}
sort.Sort(bases(a))
k := 0