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

diff --git a/src/pkg/exp/gotype/gotype.go b/src/pkg/exp/gotype/gotype.go
index e848ed0e6665c99285f4d4a101154d2f29b41fe1..fc0bdb44ed838535db174510ff8891c280d195d5 100644 (file)
--- 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
similarity index 100%
rename from src/pkg/exp/types/staging/builtins.go
rename to src/pkg/exp/types/builtins.go

diff --git a/src/pkg/exp/types/staging/check.go b/src/pkg/exp/types/check.go
similarity index 100%
rename from src/pkg/exp/types/staging/check.go
rename to 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
similarity index 100%
rename from src/pkg/exp/types/staging/check_test.go
rename to src/pkg/exp/types/check_test.go

diff --git a/src/pkg/exp/types/staging/const.go b/src/pkg/exp/types/const.go
similarity index 100%
rename from src/pkg/exp/types/staging/const.go
rename to src/pkg/exp/types/const.go

diff --git a/src/pkg/exp/types/staging/conversions.go b/src/pkg/exp/types/conversions.go
similarity index 100%
rename from src/pkg/exp/types/staging/conversions.go
rename to src/pkg/exp/types/conversions.go

diff --git a/src/pkg/exp/types/staging/errors.go b/src/pkg/exp/types/errors.go
similarity index 100%
rename from src/pkg/exp/types/staging/errors.go
rename to src/pkg/exp/types/errors.go

diff --git a/src/pkg/exp/types/staging/exportdata.go b/src/pkg/exp/types/exportdata.go
similarity index 100%
rename from src/pkg/exp/types/staging/exportdata.go
rename to src/pkg/exp/types/exportdata.go

diff --git a/src/pkg/exp/types/staging/expr.go b/src/pkg/exp/types/expr.go
similarity index 100%
rename from src/pkg/exp/types/staging/expr.go
rename to src/pkg/exp/types/expr.go

diff --git a/src/pkg/exp/types/staging/gcimporter.go b/src/pkg/exp/types/gcimporter.go
similarity index 100%
rename from src/pkg/exp/types/staging/gcimporter.go
rename to 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
similarity index 100%
rename from src/pkg/exp/types/staging/gcimporter_test.go
rename to src/pkg/exp/types/gcimporter_test.go

diff --git a/src/pkg/exp/types/staging/operand.go b/src/pkg/exp/types/operand.go
similarity index 100%
rename from src/pkg/exp/types/staging/operand.go
rename to src/pkg/exp/types/operand.go

diff --git a/src/pkg/exp/types/staging/predicates.go b/src/pkg/exp/types/predicates.go
similarity index 100%
rename from src/pkg/exp/types/staging/predicates.go
rename to 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
similarity index 100%
rename from src/pkg/exp/types/staging/resolver_test.go
rename to src/pkg/exp/types/resolver_test.go

diff --git a/src/pkg/exp/types/staging/stmt.go b/src/pkg/exp/types/stmt.go
similarity index 100%
rename from src/pkg/exp/types/staging/stmt.go
rename to 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
similarity index 100%
rename from src/pkg/exp/types/staging/testdata/builtins.src
rename to 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
similarity index 100%
rename from src/pkg/exp/types/staging/testdata/const0.src
rename to 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
similarity index 100%
rename from src/pkg/exp/types/staging/testdata/conversions.src
rename to 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
similarity index 100%
rename from src/pkg/exp/types/staging/testdata/decls0.src
rename to 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
similarity index 100%
rename from src/pkg/exp/types/staging/testdata/decls1.src
rename to 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
similarity index 100%
rename from src/pkg/exp/types/staging/testdata/decls2a.src
rename to 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
similarity index 100%
rename from src/pkg/exp/types/staging/testdata/decls2b.src
rename to 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
similarity index 100%
rename from src/pkg/exp/types/staging/testdata/exports.go
rename to 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
similarity index 100%
rename from src/pkg/exp/types/staging/testdata/expr0.src
rename to 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
similarity index 100%
rename from src/pkg/exp/types/staging/testdata/expr1.src
rename to 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
similarity index 100%
rename from src/pkg/exp/types/staging/testdata/expr2.src
rename to 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
similarity index 100%
rename from src/pkg/exp/types/staging/testdata/expr3.src
rename to 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
similarity index 100%
rename from src/pkg/exp/types/staging/testdata/stmt0.src
rename to src/pkg/exp/types/testdata/stmt0.src

diff --git a/src/pkg/exp/types/staging/types.go b/src/pkg/exp/types/types.go
similarity index 100%
rename from src/pkg/exp/types/staging/types.go
rename to 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
similarity index 100%
rename from src/pkg/exp/types/staging/types_test.go
rename to src/pkg/exp/types/types_test.go

diff --git a/src/pkg/exp/types/staging/universe.go b/src/pkg/exp/types/universe.go
similarity index 100%
rename from src/pkg/exp/types/staging/universe.go
rename to src/pkg/exp/types/universe.go