From e5be6432a8c7b4295281635b9bcb30e21946d22d Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Mon, 16 Mar 2015 19:03:09 -0400 Subject: [PATCH] cmd/internal/gc: mv builtins builtin This directory is processed by mkbuiltin.go and generates builtin.go. It should be named builtin too, not builtins, both for consistency and because file and directory names in general are singular unless forced otherwise. Commented on CL 6233 too. Change-Id: Ic5d3671443ae9292b69fda118f61a11c88d823fa Reviewed-on: https://go-review.googlesource.com/7660 Reviewed-by: Minux Ma --- src/cmd/internal/gc/{builtins => builtin}/runtime.go | 0 src/cmd/internal/gc/{builtins => builtin}/unsafe.go | 0 src/cmd/internal/gc/mkbuiltin.go | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename src/cmd/internal/gc/{builtins => builtin}/runtime.go (100%) rename src/cmd/internal/gc/{builtins => builtin}/unsafe.go (100%) diff --git a/src/cmd/internal/gc/builtins/runtime.go b/src/cmd/internal/gc/builtin/runtime.go similarity index 100% rename from src/cmd/internal/gc/builtins/runtime.go rename to src/cmd/internal/gc/builtin/runtime.go diff --git a/src/cmd/internal/gc/builtins/unsafe.go b/src/cmd/internal/gc/builtin/unsafe.go similarity index 100% rename from src/cmd/internal/gc/builtins/unsafe.go rename to src/cmd/internal/gc/builtin/unsafe.go diff --git a/src/cmd/internal/gc/mkbuiltin.go b/src/cmd/internal/gc/mkbuiltin.go index f32a75b747e..b2362a6f01a 100644 --- a/src/cmd/internal/gc/mkbuiltin.go +++ b/src/cmd/internal/gc/mkbuiltin.go @@ -50,7 +50,7 @@ func main() { // Compile .go file, import data from .6 file, and write Go string version. func mkbuiltin(w io.Writer, gochar string, name string) { - if err := exec.Command("go", "tool", gochar+"g", "-A", "builtins/"+name+".go").Run(); err != nil { + if err := exec.Command("go", "tool", gochar+"g", "-A", "builtin/"+name+".go").Run(); err != nil { log.Fatal(err) } obj := fmt.Sprintf("%s.%s", name, gochar)