Skip to content

Commit 49c1da4

Browse files
committed
internal/itoa, internal/runtime/strconv: delete
Replaced by internal/strconv. Change-Id: I0656a9ad5075e60339e963fbae7d194d2f3e16be Reviewed-on: https://go-review.googlesource.com/c/go/+/716001 Reviewed-by: David Chase <drchase@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
1 parent b2a346b commit 49c1da4

40 files changed

+104
-395
lines changed

src/cmd/internal/objabi/pkgspecial.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ var runtimePkgs = []string{
5555
"internal/runtime/gc/scan",
5656
"internal/runtime/maps",
5757
"internal/runtime/math",
58-
"internal/runtime/strconv",
5958
"internal/runtime/sys",
6059
"internal/runtime/syscall/linux",
6160
"internal/runtime/syscall/windows",
@@ -71,6 +70,7 @@ var runtimePkgs = []string{
7170
"internal/goexperiment",
7271
"internal/goos",
7372
"internal/profilerecord",
73+
"internal/strconv",
7474
"internal/stringslite",
7575
}
7676

src/go/build/deps_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ var depsRules = `
8787
structs
8888
< internal/bytealg
8989
< internal/stringslite
90-
< internal/itoa
9190
< internal/unsafeheader
9291
< internal/race
9392
< internal/msan
@@ -100,7 +99,6 @@ var depsRules = `
10099
< internal/runtime/gc
101100
< internal/runtime/math
102101
< internal/runtime/maps
103-
< internal/runtime/strconv
104102
< internal/runtime/cgroup
105103
< internal/runtime/gc/scan
106104
< runtime
@@ -301,7 +299,7 @@ var depsRules = `
301299
FMT
302300
< text/template/parse;
303301
304-
internal/bytealg, internal/itoa, math/bits, slices, strconv, unique
302+
internal/bytealg, math/bits, slices, strconv, unique
305303
< net/netip;
306304
307305
FMT, net/netip

src/internal/coverage/pkid.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ var rtPkgs = [...]string{
6363
"internal/runtime/exithook",
6464
"internal/runtime/gc",
6565
"internal/runtime/math",
66-
"internal/runtime/strconv",
6766
"internal/runtime/sys",
6867
"internal/runtime/maps",
6968
"internal/runtime/syscall/linux",
7069
"internal/runtime/syscall/windows",
7170
"internal/runtime/cgroup",
71+
"internal/strconv",
7272
"internal/stringslite",
7373
"runtime",
7474
}

src/internal/itoa/itoa.go

Lines changed: 0 additions & 57 deletions
This file was deleted.

src/internal/itoa/itoa_test.go

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/internal/poll/fd_io_plan9.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package poll
66

77
import (
8-
"internal/itoa"
8+
"internal/strconv"
99
"runtime"
1010
"sync"
1111
"syscall"
@@ -72,7 +72,7 @@ func (aio *asyncIO) Cancel() {
7272
if aio.pid == -1 {
7373
return
7474
}
75-
f, e := syscall.Open("/proc/"+itoa.Itoa(aio.pid)+"/note", syscall.O_WRONLY)
75+
f, e := syscall.Open("/proc/"+strconv.Itoa(aio.pid)+"/note", syscall.O_WRONLY)
7676
if e != nil {
7777
return
7878
}

src/internal/poll/fd_unix.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
package poll
88

99
import (
10-
"internal/itoa"
10+
"internal/strconv"
1111
"internal/syscall/unix"
1212
"io"
1313
"sync/atomic"
@@ -379,7 +379,7 @@ func (fd *FD) Write(p []byte) (int, error) {
379379
// If we don't check this we will panic
380380
// with slice bounds out of range.
381381
// Use a more informative panic.
382-
panic("invalid return from write: got " + itoa.Itoa(n) + " from a write of " + itoa.Itoa(max-nn))
382+
panic("invalid return from write: got " + strconv.Itoa(n) + " from a write of " + strconv.Itoa(max-nn))
383383
}
384384
nn += n
385385
}

src/internal/runtime/cgroup/cgroup_linux.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ package cgroup
66

77
import (
88
"internal/bytealg"
9-
"internal/runtime/strconv"
109
"internal/runtime/syscall/linux"
10+
"internal/strconv"
1111
)
1212

1313
var (
@@ -220,8 +220,8 @@ func parseV1Number(buf []byte) (int64, error) {
220220
}
221221
buf = buf[:i]
222222

223-
val, ok := strconv.Atoi64(string(buf))
224-
if !ok {
223+
val, err := strconv.ParseInt(string(buf), 10, 64)
224+
if err != nil {
225225
return 0, errMalformedFile
226226
}
227227

@@ -280,13 +280,13 @@ func parseV2Limit(buf []byte) (float64, bool, error) {
280280
}
281281
periodStr = periodStr[:i]
282282

283-
quota, ok := strconv.Atoi64(string(quotaStr))
284-
if !ok {
283+
quota, err := strconv.ParseInt(string(quotaStr), 10, 64)
284+
if err != nil {
285285
return 0, false, errMalformedFile
286286
}
287287

288-
period, ok := strconv.Atoi64(string(periodStr))
289-
if !ok {
288+
period, err := strconv.ParseInt(string(periodStr), 10, 64)
289+
if err != nil {
290290
return 0, false, errMalformedFile
291291
}
292292

src/internal/runtime/strconv/atoi.go

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)