undo CL 4557047 / 8818ac606e92

I don't think we've discussed this API enough.

««« original CL description
bike/shed: new package.

It comes up often enough that it's time to provide
the utility of a standard package.

R=r, mirtchovski, adg, rsc, n13m3y3r, ality, go.peter.90, lstoakes, iant, jan.mercl, bsiegert, robert.hencke, rogpeppe, befelemepeseveze, kevlar
CC=golang-dev
https://golang.org/cl/4557047
»»»

R=dsymonds, bradfitz, gri
CC=golang-dev
https://golang.org/cl/4576065

diff --git a/src/pkg/Makefile b/src/pkg/Makefile
index 9bed810267a08fbff379b5d45b15f547748b334c..b743660813dfba8d0a1f1a8fb1ffd07e96ac3ff2 100644 (file)
--- a/src/pkg/Makefile
+++ b/src/pkg/Makefile
@@ -18,7 +18,6 @@ DIRS=\
        archive/zip\
        asn1\
        big\
-       bike/shed\
        bufio\
        bytes\
        cmath\

diff --git a/src/pkg/bike/shed/Makefile b/src/pkg/bike/shed/Makefile
deleted file mode 100644 (file)
index a2538a1..0000000
--- a/src/pkg/bike/shed/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2011 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.
-
-include ../../../Make.inc
-
-TARG=bike/shed
-GOFILES=\
-       colors.go\
-
-include ../../../Make.pkg

diff --git a/src/pkg/bike/shed/colors.go b/src/pkg/bike/shed/colors.go
deleted file mode 100644 (file)
index 0466b04..0000000
--- a/src/pkg/bike/shed/colors.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2011 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.
-
-/*
-Package shed defines colors for bike sheds.
-
-See http://red.bikeshed.org/ for more details.
-
-TODO: More colors, colour support, stripes, methods, ponies.
-*/
-package shed
-
-// A Color represents a color, or a colour if you're colonial enough.
-type Color uint8
-
-const (
-       Red Color = iota
-       Green
-       Yellow
-       Blue
-       Purple
-       Magenta
-       Chartreuse
-       Cyan
-)

diff --git a/src/pkg/bike/shed/colors_test.go b/src/pkg/bike/shed/colors_test.go
deleted file mode 100644 (file)
index b2ac3c1..0000000
--- a/src/pkg/bike/shed/colors_test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2011 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.
-
-package shed
-
-import (
-       "testing"
-)
-
-func TestCompilerIsNotColorBlind(t *testing.T) {
-       if Red == Green {
-               t.Error("Expected Red != Green, but couldn't distinguish them")
-       }
-}