simplify various code using new map index rule
R=r
CC=golang-dev
https://golang.org/cl/833044
diff --git a/src/pkg/expvar/expvar.go b/src/pkg/expvar/expvar.go
index bed31db..070ba4e 100644
--- a/src/pkg/expvar/expvar.go
+++ b/src/pkg/expvar/expvar.go
@@ -87,10 +87,7 @@
func (v *Map) Get(key string) Var {
v.mu.Lock()
defer v.mu.Unlock()
- if av, ok := v.m[key]; ok {
- return av
- }
- return nil
+ return v.m[key]
}
func (v *Map) Set(key string, av Var) {
@@ -168,10 +165,7 @@
// Get retrieves a named exported variable.
func Get(name string) Var {
- if v, ok := vars[name]; ok {
- return v
- }
- return nil
+ return vars[name]
}
// RemoveAll removes all exported variables.