gotypes: updates for dropping of Go 1.4 support in x/tools
Change-Id: Ibb2b40434701d33f33c4d7cb72e80393b005f8ce
Reviewed-on: https://go-review.googlesource.com/20048
Reviewed-by: Robert Griesemer <gri@golang.org>
diff --git a/gotypes/Makefile b/gotypes/Makefile
index b7eb3d9..8d40c92 100644
--- a/gotypes/Makefile
+++ b/gotypes/Makefile
@@ -1,5 +1,6 @@
all: README.md
+ go build ./...
README.md: go-types.md weave.go $(wildcard */*.go)
go run weave.go go-types.md >README.md
diff --git a/gotypes/README.md b/gotypes/README.md
index 7f35d03..79d6c26 100644
--- a/gotypes/README.md
+++ b/gotypes/README.md
@@ -38,6 +38,7 @@
The [`go/types` package]('https://golang.org/pkg/go/types) is a
type-checker for Go programs, designed by Robert Griesemer.
+It became part of Go's standard library in Go 1.5.
Measured by lines of code and by API surface area, it is one of the
most complex packages in Go's standard library, and using it requires
a firm grasp of the structure of Go programs.
@@ -47,16 +48,6 @@
to analyze or manipulate Go programs and that you have some knowledge
of how a typical compiler works.
-
-
-The `go/types` package became part of Go's standard library in Go 1.5.
-Prior to that, it was located at
-[`golang.org/x/tools/go/types`](https://godoc.org/golang.org/x/tools/go/types),
-though that package will be deleted one month after the release
-of Go 1.6 in early 2016.
-
-
-
The type checker complements several existing
standard packages for analyzing Go programs.
We've listed them below.
@@ -92,10 +83,6 @@
checker that loads, parses, and type-checks a complete Go program from
source code.
We use it in some of our examples and you may find it useful too.
-(Please note that until March 2016, the
-`golang.org/x/tools/...` packages will continue to depend on the
-old `golang.org/x/tools/go/types` package, not on the
-new standard `go/types` package. The two are almost identical.)
diff --git a/gotypes/go-types.md b/gotypes/go-types.md
index a47cc5d..b20784c 100644
--- a/gotypes/go-types.md
+++ b/gotypes/go-types.md
@@ -15,6 +15,7 @@
The [`go/types` package]('https://golang.org/pkg/go/types) is a
type-checker for Go programs, designed by Robert Griesemer.
+It became part of Go's standard library in Go 1.5.
Measured by lines of code and by API surface area, it is one of the
most complex packages in Go's standard library, and using it requires
a firm grasp of the structure of Go programs.
@@ -24,16 +25,6 @@
to analyze or manipulate Go programs and that you have some knowledge
of how a typical compiler works.
-
-
-The `go/types` package became part of Go's standard library in Go 1.5.
-Prior to that, it was located at
-[`golang.org/x/tools/go/types`](https://godoc.org/golang.org/x/tools/go/types),
-though that package will be deleted one month after the release
-of Go 1.6 in early 2016.
-
-
-
The type checker complements several existing
standard packages for analyzing Go programs.
We've listed them below.
@@ -69,10 +60,6 @@
checker that loads, parses, and type-checks a complete Go program from
source code.
We use it in some of our examples and you may find it useful too.
-(Please note that until March 2016, the
-`golang.org/x/tools/...` packages will continue to depend on the
-old `golang.org/x/tools/go/types` package, not on the
-new standard `go/types` package. The two are almost identical.)
diff --git a/gotypes/hugeparam/main.go b/gotypes/hugeparam/main.go
index ba62aaa..1474403 100644
--- a/gotypes/hugeparam/main.go
+++ b/gotypes/hugeparam/main.go
@@ -9,10 +9,10 @@
"fmt"
"go/ast"
"go/token"
+ "go/types"
"log"
"golang.org/x/tools/go/loader"
- "golang.org/x/tools/go/types" // TODO: will use std go/types after Mar 2016
)
//!+
diff --git a/gotypes/skeleton/main.go b/gotypes/skeleton/main.go
index 1d8ed14..c3961e2 100644
--- a/gotypes/skeleton/main.go
+++ b/gotypes/skeleton/main.go
@@ -12,6 +12,7 @@
import (
"fmt"
+ "go/types"
"log"
"os"
"strings"
@@ -19,7 +20,6 @@
"unicode/utf8"
"golang.org/x/tools/go/loader"
- "golang.org/x/tools/go/types" // TODO: will use std go/types after Feb 2016
)
const usage = "Usage: skeleton <package> <interface> <concrete>"
