这是indexloc提供的服务，不要输入任何密码
Skip to content
This repository was archived by the owner on Feb 13, 2025. It is now read-only.

Style fixes for 1.15 compatibility #2490

Merged
merged 2 commits into from
Sep 4, 2020
Merged

Style fixes for 1.15 compatibility #2490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3962932
Remove unneeded string() cast that now triggers vet check in go 1.15
Sep 4, 2020
5f11542
Remove string() cast in favour of Itoa
Sep 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/bosun/expr/parse/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,10 +364,10 @@ func (b *BinaryNode) Check(t *Tree) error {
t1 := b.Args[0].Return()
t2 := b.Args[1].Return()
if !(t1 == models.TypeSeriesSet || t1 == models.TypeNumberSet || t1 == models.TypeScalar) {
return fmt.Errorf("expected NumberSet, SeriesSet, or Scalar, got %v", string(t1))
return fmt.Errorf("expected NumberSet, SeriesSet, or Scalar, got %v", t1)
}
if !(t2 == models.TypeSeriesSet || t2 == models.TypeNumberSet || t2 == models.TypeScalar) {
return fmt.Errorf("expected NumberSet, SeriesSet, or Scalar, got %v", string(t1))
return fmt.Errorf("expected NumberSet, SeriesSet, or Scalar, got %v", t1)
}
if err := b.Args[0].Check(t); err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion cmd/scollector/collectors/processes_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ func linuxProcMonitor(w *WatchedProc, md *opentsdb.MultiDataPoint) error {
if err != nil {
return fmt.Errorf("failed to convert process rss memory: %v", err)
}
if pid == string(os.Getpid()) {
if pid == strconv.Itoa(os.Getpid()) {
TotalScollectorMemoryMB = uint64(rss) * uint64(osPageSize) / 1024 / 1024
}
totalRSSMem += rss
Expand Down