go/constant: rename go/constants

Change-Id: I4b1ce33253890de9bc64fee9b476fe52eec87fc0
Reviewed-on: https://go-review.googlesource.com/9920
Reviewed-by: Russ Cox <rsc@golang.org>
Reviewed-by: Rob Pike <r@golang.org>

diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index 52c5a7dd80115d96266222bc60f77616e759ae4e..5a28c34adf012f76ff5917333d9daa1eef55d545 100644 (file)
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -341,11 +341,11 @@ var pkgDeps = map[string][]string{
        // dependencies.  Do not simply update them in situ.
        "container/heap":                    {"sort"},
        "debug/plan9obj":                    {"encoding/binary", "errors", "fmt", "io", "os"},
-       "go/constants":                      {"fmt", "go/token", "math/big", "strconv"},
+       "go/constant":                       {"fmt", "go/token", "math/big", "strconv"},
        "go/format":                         {"bytes", "fmt", "go/ast", "go/parser", "go/printer", "go/token", "internal/format", "io"},
        "go/importer":                       {"go/internal/gcimporter", "go/types", "io", "runtime"},
-       "go/internal/gcimporter":            {"bufio", "errors", "fmt", "go/build", "go/constants", "go/token", "go/types", "io", "os", "path/filepath", "strconv", "strings", "text/scanner"},
-       "go/types":                          {"bytes", "container/heap", "fmt", "go/ast", "go/constants", "go/parser", "go/token", "io", "math", "path", "sort", "strconv", "strings", "sync", "unicode"},
+       "go/internal/gcimporter":            {"bufio", "errors", "fmt", "go/build", "go/constant", "go/token", "go/types", "io", "os", "path/filepath", "strconv", "strings", "text/scanner"},
+       "go/types":                          {"bytes", "container/heap", "fmt", "go/ast", "go/constant", "go/parser", "go/token", "io", "math", "path", "sort", "strconv", "strings", "sync", "unicode"},
        "image/internal/imageutil":          {"image"},
        "internal/format":                   {"bytes", "go/ast", "go/parser", "go/printer", "go/token", "strings"},
        "internal/singleflight":             {"sync"},

diff --git a/src/go/constants/go13.go b/src/go/constant/go13.go
similarity index 96%
rename from src/go/constants/go13.go
rename to src/go/constant/go13.go
index f445b82154d0bea656ac8450c5b481c9c093ad35..a4a838a290834ff4a9edd3a2f4ceaccde6630a8d 100644 (file)
--- a/src/go/constants/go13.go
+++ b/src/go/constant/go13.go
@@ -4,7 +4,7 @@
 
 // +build !go1.4
 
-package constants
+package constant
 
 import (
        "math"

diff --git a/src/go/constants/go14.go b/src/go/constant/go14.go
similarity index 93%
rename from src/go/constants/go14.go
rename to src/go/constant/go14.go
index c698fa6de97edbda1c028620f9b41f273e7972b3..2ab6da02f67045cc7b5b4acdb984c9a270e2678b 100644 (file)
--- a/src/go/constants/go14.go
+++ b/src/go/constant/go14.go
@@ -4,7 +4,7 @@
 
 // +build go1.4
 
-package constants
+package constant
 
 import "math/big"
 

diff --git a/src/go/constants/value.go b/src/go/constant/value.go
similarity index 99%
rename from src/go/constants/value.go
rename to src/go/constant/value.go
index ad4533c900d71535aa7068c70497e5aaf4bd624f..79a80af1ab1474eaaec4b3dfbe9d53b055258888 100644 (file)
--- a/src/go/constants/value.go
+++ b/src/go/constant/value.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Package constants implements Values representing untyped
+// Package constant implements Values representing untyped
 // Go constants and the corresponding operations. Values
 // and operations may have arbitrary or unlimited precision.
 //
@@ -11,7 +11,7 @@
 // values produce unknown values unless specified
 // otherwise.
 //
-package constants // import "go/constants"
+package constant // import "go/constant"
 
 import (
        "fmt"

diff --git a/src/go/constants/value_test.go b/src/go/constant/value_test.go
similarity index 99%
rename from src/go/constants/value_test.go
rename to src/go/constant/value_test.go
index 6a74e2d13cbc518f5ba174014a20b1878112052d..08cdd5e625cb8f41928285c60e2095f609e5f860 100644 (file)
--- a/src/go/constants/value_test.go
+++ b/src/go/constant/value_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package constants
+package constant
 
 import (
        "go/token"

diff --git a/src/go/internal/gcimporter/gcimporter.go b/src/go/internal/gcimporter/gcimporter.go
index ee83a725fa1c15ee688f3d93a6c65cf6d83a7585..ec71d793bdc17926a0e99afa1a27a5f31e07cadd 100644 (file)
--- a/src/go/internal/gcimporter/gcimporter.go
+++ b/src/go/internal/gcimporter/gcimporter.go
@@ -18,7 +18,7 @@ import (
        "strings"
        "text/scanner"
 
-       exact "go/constants"
+       exact "go/constant"
        "go/types"
 )
 

diff --git a/src/go/types/api.go b/src/go/types/api.go
index a2a55e31e7de9d99d157826121086af829bb6210..ad9baa9527979d48c02d4ee88db5bfb47e0d02ed 100644 (file)
--- a/src/go/types/api.go
+++ b/src/go/types/api.go
@@ -28,7 +28,7 @@ import (
        "bytes"
        "fmt"
        "go/ast"
-       exact "go/constants" // Renamed to reduce diffs from x/tools.  TODO: remove
+       exact "go/constant" // Renamed to reduce diffs from x/tools.  TODO: remove
        "go/token"
 )
 

diff --git a/src/go/types/builtins.go b/src/go/types/builtins.go
index 203a9c196ddcc47eb43cb22c797019c35e03cd8a..c224699e3c2206fc522d96f78e7c25b96a6acce1 100644 (file)
--- a/src/go/types/builtins.go
+++ b/src/go/types/builtins.go
@@ -8,7 +8,7 @@ package types
 
 import (
        "go/ast"
-       exact "go/constants" // Renamed to reduce diffs from x/tools.  TODO: remove
+       exact "go/constant" // Renamed to reduce diffs from x/tools.  TODO: remove
        "go/token"
 )
 

diff --git a/src/go/types/check.go b/src/go/types/check.go
index b4c356a6ed1f6af218a97c9078cbfaf473bf3950..7ae81eb2d01fe4be390c52f6c8c751dc7d2796a5 100644 (file)
--- a/src/go/types/check.go
+++ b/src/go/types/check.go
@@ -8,7 +8,7 @@ package types
 
 import (
        "go/ast"
-       exact "go/constants" // Renamed to reduce diffs from x/tools.  TODO: remove
+       exact "go/constant" // Renamed to reduce diffs from x/tools.  TODO: remove
        "go/token"
 )
 

diff --git a/src/go/types/conversions.go b/src/go/types/conversions.go
index 0cf9953c4fd049736d477b769f6dc31a5022e324..da65f4276eedff5b412bfb5bfc171903132960bd 100644 (file)
--- a/src/go/types/conversions.go
+++ b/src/go/types/conversions.go
@@ -6,7 +6,7 @@
 
 package types
 
-import exact "go/constants" // Renamed to reduce diffs from x/tools.  TODO: remove
+import exact "go/constant" // Renamed to reduce diffs from x/tools.  TODO: remove
 
 // Conversion type-checks the conversion T(x).
 // The result is in x.

diff --git a/src/go/types/decl.go b/src/go/types/decl.go
index c2c18ecd069ded683f9e23004e4c8e7c9446dcc1..4af5b577984589254619ae8a6a7f54452c05d4f4 100644 (file)
--- a/src/go/types/decl.go
+++ b/src/go/types/decl.go
@@ -6,7 +6,7 @@ package types
 
 import (
        "go/ast"
-       exact "go/constants" // Renamed to reduce diffs from x/tools.  TODO: remove
+       exact "go/constant" // Renamed to reduce diffs from x/tools.  TODO: remove
        "go/token"
 )
 

diff --git a/src/go/types/expr.go b/src/go/types/expr.go
index f91d89e8b8f7e35d5af5449747423db81e097b46..425ae91bb49a123330db4fe1737a6424466f5338 100644 (file)
--- a/src/go/types/expr.go
+++ b/src/go/types/expr.go
@@ -9,7 +9,7 @@ package types
 import (
        "fmt"
        "go/ast"
-       exact "go/constants" // Renamed to reduce diffs from x/tools.  TODO: remove
+       exact "go/constant" // Renamed to reduce diffs from x/tools.  TODO: remove
        "go/token"
        "math"
 )

diff --git a/src/go/types/object.go b/src/go/types/object.go
index 2404753b36873f1b44f95b7a464143b06f996a60..829e7a96b37ffe226eaab5a7110943b3d94c2039 100644 (file)
--- a/src/go/types/object.go
+++ b/src/go/types/object.go
@@ -8,7 +8,7 @@ import (
        "bytes"
        "fmt"
        "go/ast"
-       exact "go/constants" // Renamed to reduce diffs from x/tools.  TODO: remove
+       exact "go/constant" // Renamed to reduce diffs from x/tools.  TODO: remove
        "go/token"
 )
 

diff --git a/src/go/types/operand.go b/src/go/types/operand.go
index 88c387058e993a9ad2c84529ea21df2c50bfe4bf..8d167067d5cf6fa9872711e986691358b13d589d 100644 (file)
--- a/src/go/types/operand.go
+++ b/src/go/types/operand.go
@@ -9,7 +9,7 @@ package types
 import (
        "bytes"
        "go/ast"
-       exact "go/constants" // Renamed to reduce diffs from x/tools.  TODO: remove
+       exact "go/constant" // Renamed to reduce diffs from x/tools.  TODO: remove
        "go/token"
 )
 

diff --git a/src/go/types/resolver.go b/src/go/types/resolver.go
index be46b59f11453aa552c2707c4b8c4c79ffa4b6a7..64dcebe2164fa0daa44c2562ad391246f4632320 100644 (file)
--- a/src/go/types/resolver.go
+++ b/src/go/types/resolver.go
@@ -7,7 +7,7 @@ package types
 import (
        "fmt"
        "go/ast"
-       exact "go/constants" // Renamed to reduce diffs from x/tools.  TODO: remove
+       exact "go/constant" // Renamed to reduce diffs from x/tools.  TODO: remove
        "go/token"
        pathLib "path"
        "strconv"

diff --git a/src/go/types/self_test.go b/src/go/types/self_test.go
index 85dc6ae0ecf1200f07babb523dbdf0fba61f1665..e52c5afdc896626589089ca50de907840c056bed 100644 (file)
--- a/src/go/types/self_test.go
+++ b/src/go/types/self_test.go
@@ -31,7 +31,7 @@ func TestSelf(t *testing.T) {
        conf := Config{Importer: importer.Default()}
        _, err = conf.Check("go/types", fset, files, nil)
        if err != nil {
-               // Importing go/constants doesn't work in the
+               // Importing go/constant doesn't work in the
                // build dashboard environment. Don't report an error
                // for now so that the build remains green.
                // TODO(gri) fix this

diff --git a/src/go/types/stmt.go b/src/go/types/stmt.go
index 8b59df3eb6812fa15bc07ca50946ba19363e7912..586f6cc15c8cbc2e1c50580851a529987816d58c 100644 (file)
--- a/src/go/types/stmt.go
+++ b/src/go/types/stmt.go
@@ -9,7 +9,7 @@ package types
 import (
        "fmt"
        "go/ast"
-       exact "go/constants" // Renamed to reduce diffs from x/tools.  TODO: remove
+       exact "go/constant" // Renamed to reduce diffs from x/tools.  TODO: remove
        "go/token"
 )
 

diff --git a/src/go/types/typexpr.go b/src/go/types/typexpr.go
index afd1dabc06a5db29ff9ee2b97f8bdca2ee645427..f4e4dcb04018d71362743c4f4ec3ae6516745aee 100644 (file)
--- a/src/go/types/typexpr.go
+++ b/src/go/types/typexpr.go
@@ -8,7 +8,7 @@ package types
 
 import (
        "go/ast"
-       exact "go/constants" // Renamed to reduce diffs from x/tools.  TODO: remove
+       exact "go/constant" // Renamed to reduce diffs from x/tools.  TODO: remove
        "go/token"
        "sort"
        "strconv"

diff --git a/src/go/types/universe.go b/src/go/types/universe.go
index c02543e95174bbe9177e7ede149ed94ea3760b28..5e445e28380fd906315949a4b0da6514230cea6b 100644 (file)
--- a/src/go/types/universe.go
+++ b/src/go/types/universe.go
@@ -7,7 +7,7 @@
 package types
 
 import (
-       exact "go/constants" // Renamed to reduce diffs from x/tools.  TODO: remove
+       exact "go/constant" // Renamed to reduce diffs from x/tools.  TODO: remove
        "go/token"
        "strings"
 )