From 42d101e9f7ee407345287ae79639e1d5d42a6ef3 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 19 Jul 2019 13:07:15 +0200 Subject: [PATCH] Fixed code formatting and import order using goimports (#167) --- internal/cbor/types.go | 6 +++--- journald/journald.go | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/internal/cbor/types.go b/internal/cbor/types.go index eb4f697..3d76ea0 100644 --- a/internal/cbor/types.go +++ b/internal/cbor/types.go @@ -24,9 +24,9 @@ func (Encoder) AppendEndMarker(dst []byte) []byte { // AppendObjectData takes an object in form of a byte array and appends to dst. func (Encoder) AppendObjectData(dst []byte, o []byte) []byte { - // BeginMarker is present in the dst, which - // should not be copied when appending to existing data. - return append(dst, o[1:]...) + // BeginMarker is present in the dst, which + // should not be copied when appending to existing data. + return append(dst, o[1:]...) } // AppendArrayStart adds markers to indicate the start of an array. diff --git a/journald/journald.go b/journald/journald.go index dde4e3e..16b7562 100644 --- a/journald/journald.go +++ b/journald/journald.go @@ -20,11 +20,12 @@ import ( "bytes" "encoding/json" "fmt" + "io" + "strings" + "github.com/coreos/go-systemd/journal" "github.com/rs/zerolog" "github.com/rs/zerolog/internal/cbor" - "io" - "strings" ) const defaultJournalDPrio = journal.PriNotice