Skip to content

Commit e911d7e

Browse files
committed
expvar: add Delete function
Adds a `Delete` function to the expvar package to remove a named exported variable. Calls `Map.Delete`. Fixes #73814
1 parent 4193679 commit e911d7e

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

src/cmd/api/testdata/src/pkg/p1/golden.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
pkg p1, const A //deprecated
12
pkg p1, const A = 1
23
pkg p1, const A ideal-int
3-
pkg p1, const A //deprecated
44
pkg p1, const A64 = 1
55
pkg p1, const A64 int64
66
pkg p1, const AIsLowerA = 11
@@ -25,8 +25,8 @@ pkg p1, func TakesFunc(func(int) int)
2525
pkg p1, method (*B) JustOnB()
2626
pkg p1, method (*B) OnBothTandBPtr()
2727
pkg p1, method (*Embedded) OnEmbedded()
28-
pkg p1, method (*S2) SMethod(int8, int16, int64)
2928
pkg p1, method (*S2) SMethod //deprecated
29+
pkg p1, method (*S2) SMethod(int8, int16, int64)
3030
pkg p1, method (*T) JustOnT()
3131
pkg p1, method (*T) OnBothTandBPtr()
3232
pkg p1, method (B) OnBothTandBVal()
@@ -53,8 +53,8 @@ pkg p1, type Error interface { Error, Temporary }
5353
pkg p1, type Error interface, Error() string
5454
pkg p1, type Error interface, Temporary() bool
5555
pkg p1, type FuncType func(int, int, string) (*B, error)
56-
pkg p1, type I interface, Get(string) int64
5756
pkg p1, type I interface, Get //deprecated
57+
pkg p1, type I interface, Get(string) int64
5858
pkg p1, type I interface, GetNamed(string) int64
5959
pkg p1, type I interface, Name() string
6060
pkg p1, type I interface, PackageTwoMeth()
@@ -63,9 +63,9 @@ pkg p1, type I interface, unexported methods
6363
pkg p1, type MyInt int
6464
pkg p1, type Namer interface { Name }
6565
pkg p1, type Namer interface, Name() string
66+
pkg p1, type Private //deprecated
6667
pkg p1, type Private interface, X()
6768
pkg p1, type Private interface, unexported methods
68-
pkg p1, type Private //deprecated
6969
pkg p1, type Public interface { X, Y }
7070
pkg p1, type Public interface, X()
7171
pkg p1, type Public interface, Y()
@@ -84,8 +84,8 @@ pkg p1, type TPtrExported struct
8484
pkg p1, type TPtrExported struct, embedded *Embedded
8585
pkg p1, type TPtrUnexported struct
8686
pkg p1, type Time struct
87-
pkg p1, type URL struct
8887
pkg p1, type URL //deprecated
88+
pkg p1, type URL struct
8989
pkg p1, var Byte uint8
9090
pkg p1, var ByteConv []uint8
9191
pkg p1, var ByteFunc func(uint8) int32
@@ -97,8 +97,8 @@ pkg p1, var StrConv string
9797
pkg p1, var V string
9898
pkg p1, var V1 uint64
9999
pkg p1, var V2 p2.Twoer
100-
pkg p1, var VError Error
101100
pkg p1, var VError //deprecated
101+
pkg p1, var VError Error
102102
pkg p1, var X I
103103
pkg p1, var X0 int64
104104
pkg p1, var Y int
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
pkg p2, func F() string
21
pkg p2, func F //deprecated
2+
pkg p2, func F() string
33
pkg p2, func G() Twoer
44
pkg p2, func NewError(string) error
55
pkg p2, type Twoer interface { PackageTwoMeth }
6-
pkg p2, type Twoer interface, PackageTwoMeth()
76
pkg p2, type Twoer interface, PackageTwoMeth //deprecated
8-
7+
pkg p2, type Twoer interface, PackageTwoMeth()
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
pkg p4, func Clone //deprecated
2+
pkg p4, func Clone[$0 interface{ ~[]$1 }, $1 interface{}]($0) $0
13
pkg p4, func NewPair[$0 interface{ M }, $1 interface{ ~int }]($0, $1) Pair[$0, $1]
2-
pkg p4, method (Pair[$0, $1]) Second() $1
34
pkg p4, method (Pair[$0, $1]) First() $0
5+
pkg p4, method (Pair[$0, $1]) Second() $1
46
pkg p4, type Pair[$0 interface{ M }, $1 interface{ ~int }] struct
5-
pkg p4, func Clone[$0 interface{ ~[]$1 }, $1 interface{}]($0) $0
6-
pkg p4, func Clone //deprecated

src/expvar/expvar.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,11 @@ func Publish(name string, v Var) {
316316
slices.Sort(vars.keys)
317317
}
318318

319+
// Delete removes a named exported variable.
320+
func Delete(name string) {
321+
vars.Delete(name)
322+
}
323+
319324
// Get retrieves a named exported variable. It returns nil if the name has
320325
// not been registered.
321326
func Get(name string) Var {

0 commit comments

Comments
 (0)