From 3b6abd8a4501d816e80b4d46e6fda4df486ccb66 Mon Sep 17 00:00:00 2001
From: Andrew Bonventre <andybons@golang.org>
Date: Mon, 12 Feb 2018 20:09:58 +0000
Subject: Revert "[release-branch.go1.10] all: merge master into
 release-branch.go1.10"

This reverts commit b83d7f72537bdc0cec2e949d73ae40fbd42b7c63.

Reason for revert: wrong branch

Change-Id: I28ebb121f7b3e331729e8a6a00961b876f3dd0f2
Reviewed-on: https://go-review.googlesource.com/93455
Reviewed-by: Andrew Bonventre <andybons@golang.org>
---
 src/cmd/fix/cftype.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/cmd/fix/cftype.go b/src/cmd/fix/cftype.go
index b47b06682a..df1cc18f9e 100644
--- a/src/cmd/fix/cftype.go
+++ b/src/cmd/fix/cftype.go
@@ -119,7 +119,7 @@ func typefix(f *ast.File, badType func(string) bool) bool {
 		if !ok {
 			return
 		}
-		t, ok := s.X.(*ast.SelectorExpr)
+		t := s.X.(*ast.SelectorExpr)
 		if !ok {
 			return
 		}
-- 
cgit v1.3-5-g9baa