cli/command/system: remove deprecated io/ioutil
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
@@ -4,7 +4,6 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"sort"
|
||||
"strings"
|
||||
"text/template"
|
||||
@@ -100,7 +99,7 @@ func makeTemplate(format string) (*template.Template, error) {
|
||||
}
|
||||
// we execute the template for an empty message, so as to validate
|
||||
// a bad template like "{{.badFieldString}}"
|
||||
return tmpl, tmpl.Execute(ioutil.Discard, &eventtypes.Message{})
|
||||
return tmpl, tmpl.Execute(io.Discard, &eventtypes.Message{})
|
||||
}
|
||||
|
||||
// rfc3339NanoFixed is similar to time.RFC3339Nano, except it pads nanoseconds
|
||||
|
||||
@@ -4,7 +4,6 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"regexp"
|
||||
"sort"
|
||||
"strings"
|
||||
@@ -121,7 +120,7 @@ func needsServerInfo(template string, info info) bool {
|
||||
}
|
||||
|
||||
// This constructs an "info" object that only has the client-side fields.
|
||||
err = tmpl.Execute(ioutil.Discard, sparseInfo{
|
||||
err = tmpl.Execute(io.Discard, sparseInfo{
|
||||
ClientInfo: info.ClientInfo,
|
||||
ClientErrors: info.ClientErrors,
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user