Merge branch 'master' of github.com:golang/text

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 The Go Authors. All rights reserved.
+Copyright 2009 The Go Authors.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@ notice, this list of conditions and the following disclaimer.
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-   * Neither the name of Google Inc. nor the names of its
+   * Neither the name of Google LLC nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 

README.md

@@ -4,19 +4,7 @@
 
 This repository holds supplementary Go libraries for text processing, many involving Unicode.
 
-## Semantic Versioning
-This repo uses Semantic versioning (http://semver.org/), so
-1. MAJOR version when you make incompatible API changes,
-1. MINOR version when you add functionality in a backwards-compatible manner,
-   and
-1. PATCH version when you make backwards-compatible bug fixes.
-
-Until version 1.0.0 of x/text is reached, the minor version is considered a
-major version. So going from 0.1.0 to 0.2.0 is considered to be a major version
-bump.
-
-A major new CLDR version is mapped to a minor version increase in x/text.
-Any other new CLDR version is mapped to a patch version increase in x/text.
+## CLDR Versioning
 
 It is important that the Unicode version used in `x/text` matches the one used
 by your Go compiler. The `x/text` repository supports multiple versions of

cases/gen.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 // This program generates the trie for casing operations. The Unicode casing
 // algorithm requires the lookup of various properties and mappings for each
@@ -16,7 +15,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"reflect"
 	"strconv"
@@ -635,9 +633,9 @@ func genTablesTest() {
 
 	// We discard the output as we know we have perfect functions. We run them
 	// just to verify the properties are correct.
-	n := printProperties(ioutil.Discard, "DerivedCoreProperties.txt", "Cased", verifyCased)
-	n += printProperties(ioutil.Discard, "DerivedCoreProperties.txt", "Lowercase", verifyLower)
-	n += printProperties(ioutil.Discard, "DerivedCoreProperties.txt", "Uppercase", verifyUpper)
+	n := printProperties(io.Discard, "DerivedCoreProperties.txt", "Cased", verifyCased)
+	n += printProperties(io.Discard, "DerivedCoreProperties.txt", "Lowercase", verifyLower)
+	n += printProperties(io.Discard, "DerivedCoreProperties.txt", "Uppercase", verifyUpper)
 	if n > 0 {
 		log.Fatalf("One of the discarded properties does not have a perfect filter.")
 	}

cases/gen_trieval.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package main
 

cases/icu.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build icu
-// +build icu
 
 package cases
 

cases/icu_test.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build icu
-// +build icu
 
 package cases