Permalink
Browse files

Drop support for Go 1.5.

Signed-off-by: Joe Tsai <joetsai@google.com>
  • Loading branch information...
1 parent c6242af commit a428635c58fe96360e83667e2e1a8343fc292bf0 @alandonovan alandonovan committed with dsnet Sep 16, 2016
Showing with 5 additions and 22 deletions.
  1. +1 −1 README.md
  2. +4 −4 lint.go
  3. +0 −17 lint16.go
View
@@ -4,7 +4,7 @@ Golint is a linter for Go source code.
## Installation
-Golint requires Go 1.5 or later.
+Golint requires Go 1.6 or later.
go get -u github.com/golang/lint/golint
View
@@ -237,9 +237,7 @@ argLoop:
var gcImporter = gcimporter.Import
-// importer implements go/types.Importer.
-// It also implements go/types.ImporterFrom, which was new in Go 1.6,
-// so vendoring will work.
+// importer implements go/types.Importer{,From}.
type importer struct {
impFn func(packages map[string]*types.Package, path, srcDir string) (*types.Package, error)
packages map[string]*types.Package
@@ -249,7 +247,9 @@ func (i importer) Import(path string) (*types.Package, error) {
return i.impFn(i.packages, path, "")
}
-// (importer).ImportFrom is in lint16.go.
+func (i importer) ImportFrom(path, srcDir string, mode types.ImportMode) (*types.Package, error) {
+ return i.impFn(i.packages, path, srcDir)
+}
func (p *pkg) typeCheck() error {
config := &types.Config{
View
@@ -1,17 +0,0 @@
-// Copyright (c) 2016 The Go Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file or at
-// https://developers.google.com/open-source/licenses/bsd.
-
-// +build go1.6
-
-package lint
-
-import "go/types"
-
-// This is in its own file so it can be ignored under Go 1.5.
-
-func (i importer) ImportFrom(path, srcDir string, mode types.ImportMode) (*types.Package, error) {
- return i.impFn(i.packages, path, srcDir)
-}

0 comments on commit a428635

Please sign in to comment.