exp/types: move exp/types/staging -> exp/types

- removes exp/types/staging
- the only code change is in exp/gotype/gotype.go

R=iant
CC=golang-dev
https://golang.org/cl/6822068

31 files changed, 1 insertions, 1 deletions

diff --git a/src/pkg/exp/gotype/gotype.go b/src/pkg/exp/gotype/gotype.go
index e848ed0e66..fc0bdb44ed 100644
--- a/src/pkg/exp/gotype/gotype.go
+++ b/src/pkg/exp/gotype/gotype.go
@@ -6,7 +6,7 @@ package main
 
 import (
 	"errors"
-	"exp/types/staging"
+	"exp/types"
 	"flag"
 	"fmt"
 	"go/ast"
diff --git a/src/pkg/exp/types/staging/builtins.go b/src/pkg/exp/types/builtins.go
index 88267042e4..88267042e4 100644
--- a/src/pkg/exp/types/staging/builtins.go
+++ b/src/pkg/exp/types/builtins.go
diff --git a/src/pkg/exp/types/staging/check.go b/src/pkg/exp/types/check.go
index 1300d0a6dd..1300d0a6dd 100644
--- a/src/pkg/exp/types/staging/check.go
+++ b/src/pkg/exp/types/check.go
diff --git a/src/pkg/exp/types/staging/check_test.go b/src/pkg/exp/types/check_test.go
index abcfcfb2cd..abcfcfb2cd 100644
--- a/src/pkg/exp/types/staging/check_test.go
+++ b/src/pkg/exp/types/check_test.go
diff --git a/src/pkg/exp/types/staging/const.go b/src/pkg/exp/types/const.go
index 5501040777..5501040777 100644
--- a/src/pkg/exp/types/staging/const.go
+++ b/src/pkg/exp/types/const.go
diff --git a/src/pkg/exp/types/staging/conversions.go b/src/pkg/exp/types/conversions.go
index cbaef8aa9a..cbaef8aa9a 100644
--- a/src/pkg/exp/types/staging/conversions.go
+++ b/src/pkg/exp/types/conversions.go
diff --git a/src/pkg/exp/types/staging/errors.go b/src/pkg/exp/types/errors.go
index 1a1659538a..1a1659538a 100644
--- a/src/pkg/exp/types/staging/errors.go
+++ b/src/pkg/exp/types/errors.go
diff --git a/src/pkg/exp/types/staging/exportdata.go b/src/pkg/exp/types/exportdata.go
index 1f6a3c7252..1f6a3c7252 100644
--- a/src/pkg/exp/types/staging/exportdata.go
+++ b/src/pkg/exp/types/exportdata.go
diff --git a/src/pkg/exp/types/staging/expr.go b/src/pkg/exp/types/expr.go
index 58a33d0548..58a33d0548 100644
--- a/src/pkg/exp/types/staging/expr.go
+++ b/src/pkg/exp/types/expr.go
diff --git a/src/pkg/exp/types/staging/gcimporter.go b/src/pkg/exp/types/gcimporter.go
index 4318e6aa21..4318e6aa21 100644
--- a/src/pkg/exp/types/staging/gcimporter.go
+++ b/src/pkg/exp/types/gcimporter.go
diff --git a/src/pkg/exp/types/staging/gcimporter_test.go b/src/pkg/exp/types/gcimporter_test.go
index 2f89d3ac91..2f89d3ac91 100644
--- a/src/pkg/exp/types/staging/gcimporter_test.go
+++ b/src/pkg/exp/types/gcimporter_test.go
diff --git a/src/pkg/exp/types/staging/operand.go b/src/pkg/exp/types/operand.go
index 49ba899d91..49ba899d91 100644
--- a/src/pkg/exp/types/staging/operand.go
+++ b/src/pkg/exp/types/operand.go
diff --git a/src/pkg/exp/types/staging/predicates.go b/src/pkg/exp/types/predicates.go
index 503027e2d9..503027e2d9 100644
--- a/src/pkg/exp/types/staging/predicates.go
+++ b/src/pkg/exp/types/predicates.go
diff --git a/src/pkg/exp/types/staging/resolver_test.go b/src/pkg/exp/types/resolver_test.go
index 4e9aa0938d..4e9aa0938d 100644
--- a/src/pkg/exp/types/staging/resolver_test.go
+++ b/src/pkg/exp/types/resolver_test.go
diff --git a/src/pkg/exp/types/staging/stmt.go b/src/pkg/exp/types/stmt.go
index 4f012499a2..4f012499a2 100644
--- a/src/pkg/exp/types/staging/stmt.go
+++ b/src/pkg/exp/types/stmt.go
diff --git a/src/pkg/exp/types/staging/testdata/builtins.src b/src/pkg/exp/types/testdata/builtins.src
index a07af89f41..a07af89f41 100644
--- a/src/pkg/exp/types/staging/testdata/builtins.src
+++ b/src/pkg/exp/types/testdata/builtins.src
diff --git a/src/pkg/exp/types/staging/testdata/const0.src b/src/pkg/exp/types/testdata/const0.src
index a2ca344c78..a2ca344c78 100644
--- a/src/pkg/exp/types/staging/testdata/const0.src
+++ b/src/pkg/exp/types/testdata/const0.src
diff --git a/src/pkg/exp/types/staging/testdata/conversions.src b/src/pkg/exp/types/testdata/conversions.src
index 1b1518366f..1b1518366f 100644
--- a/src/pkg/exp/types/staging/testdata/conversions.src
+++ b/src/pkg/exp/types/testdata/conversions.src
diff --git a/src/pkg/exp/types/staging/testdata/decls0.src b/src/pkg/exp/types/testdata/decls0.src
index 3537a9e558..3537a9e558 100644
--- a/src/pkg/exp/types/staging/testdata/decls0.src
+++ b/src/pkg/exp/types/testdata/decls0.src
diff --git a/src/pkg/exp/types/staging/testdata/decls1.src b/src/pkg/exp/types/testdata/decls1.src
index 16da045ef2..16da045ef2 100644
--- a/src/pkg/exp/types/staging/testdata/decls1.src
+++ b/src/pkg/exp/types/testdata/decls1.src
diff --git a/src/pkg/exp/types/staging/testdata/decls2a.src b/src/pkg/exp/types/testdata/decls2a.src
index 8323829f35..8323829f35 100644
--- a/src/pkg/exp/types/staging/testdata/decls2a.src
+++ b/src/pkg/exp/types/testdata/decls2a.src
diff --git a/src/pkg/exp/types/staging/testdata/decls2b.src b/src/pkg/exp/types/testdata/decls2b.src
index c7f9ddf01a..c7f9ddf01a 100644
--- a/src/pkg/exp/types/staging/testdata/decls2b.src
+++ b/src/pkg/exp/types/testdata/decls2b.src
diff --git a/src/pkg/exp/types/staging/testdata/exports.go b/src/pkg/exp/types/testdata/exports.go
index 8ee28b0942..8ee28b0942 100644
--- a/src/pkg/exp/types/staging/testdata/exports.go
+++ b/src/pkg/exp/types/testdata/exports.go
diff --git a/src/pkg/exp/types/staging/testdata/expr0.src b/src/pkg/exp/types/testdata/expr0.src
index 0ed314a95c..0ed314a95c 100644
--- a/src/pkg/exp/types/staging/testdata/expr0.src
+++ b/src/pkg/exp/types/testdata/expr0.src
diff --git a/src/pkg/exp/types/staging/testdata/expr1.src b/src/pkg/exp/types/testdata/expr1.src
index 8ef0aed6d2..8ef0aed6d2 100644
--- a/src/pkg/exp/types/staging/testdata/expr1.src
+++ b/src/pkg/exp/types/testdata/expr1.src
diff --git a/src/pkg/exp/types/staging/testdata/expr2.src b/src/pkg/exp/types/testdata/expr2.src
index 4bc2769651..4bc2769651 100644
--- a/src/pkg/exp/types/staging/testdata/expr2.src
+++ b/src/pkg/exp/types/testdata/expr2.src
diff --git a/src/pkg/exp/types/staging/testdata/expr3.src b/src/pkg/exp/types/testdata/expr3.src
index 890f5e9938..890f5e9938 100644
--- a/src/pkg/exp/types/staging/testdata/expr3.src
+++ b/src/pkg/exp/types/testdata/expr3.src
diff --git a/src/pkg/exp/types/staging/testdata/stmt0.src b/src/pkg/exp/types/testdata/stmt0.src
index e3436bc41d..e3436bc41d 100644
--- a/src/pkg/exp/types/staging/testdata/stmt0.src
+++ b/src/pkg/exp/types/testdata/stmt0.src
diff --git a/src/pkg/exp/types/staging/types.go b/src/pkg/exp/types/types.go
index eed0c8a6c3..eed0c8a6c3 100644
--- a/src/pkg/exp/types/staging/types.go
+++ b/src/pkg/exp/types/types.go
diff --git a/src/pkg/exp/types/staging/types_test.go b/src/pkg/exp/types/types_test.go
index 62ca19badc..62ca19badc 100644
--- a/src/pkg/exp/types/staging/types_test.go
+++ b/src/pkg/exp/types/types_test.go
diff --git a/src/pkg/exp/types/staging/universe.go b/src/pkg/exp/types/universe.go
index bb8b6a2bda..bb8b6a2bda 100644
--- a/src/pkg/exp/types/staging/universe.go
+++ b/src/pkg/exp/types/universe.go