os: remove race paranoia from Environ(); it's guarded now

R=rsc
CC=golang-dev
https://golang.org/cl/4426077

diff --git a/src/pkg/os/env_unix.go b/src/pkg/os/env_unix.go
index 6a8a0b17fe19b8a8064b09494e5b31a81eb3b06b..8aa71e83a0c1d2061aa5edb95c50ed7ddc4863ab 100644 (file)
--- a/src/pkg/os/env_unix.go
+++ b/src/pkg/os/env_unix.go
@@ -94,14 +94,10 @@ func Environ() []string {
        a := make([]string, len(env))
        i := 0
        for k, v := range env {
-               // check i < len(a) for safety,
-               // in case env is changing underfoot.
-               if i < len(a) {
-                       a[i] = k + "=" + v
-                       i++
-               }
+               a[i] = k + "=" + v
+               i++
        }
-       return a[0:i]
+       return a
 }
 
 // TempDir returns the default directory to use for temporary files.