diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2023-03-17 18:38:14 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2023-03-17 18:38:14 -0400 |
| commit | 0f85e72d1331b49b52925d6cc5ad083a0376104c (patch) | |
| tree | 9ba66e893d6f66096f6b06284d09c8eb3e50facc /lib/containers/optional.go | |
| parent | c0f33186aa7a8903c5e7406024f13fad48cd14e3 (diff) | |
| parent | 1ea26f04701fa66e36b058f3efb3a6c7059cdc5c (diff) | |
Merge branch 'lukeshu/lint'
Diffstat (limited to 'lib/containers/optional.go')
| -rw-r--r-- | lib/containers/optional.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/containers/optional.go b/lib/containers/optional.go index c0e7b32..5bb7bb6 100644 --- a/lib/containers/optional.go +++ b/lib/containers/optional.go @@ -1,4 +1,4 @@ -// Copyright (C) 2022 Luke Shumaker <lukeshu@lukeshu.com> +// Copyright (C) 2022-2023 Luke Shumaker <lukeshu@lukeshu.com> // // SPDX-License-Identifier: GPL-2.0-or-later @@ -19,11 +19,10 @@ var ( ) func (o Optional[T]) MarshalJSON() ([]byte, error) { - if o.OK { - return json.Marshal(o.Val) - } else { + if !o.OK { return []byte("null"), nil } + return json.Marshal(o.Val) } func (o *Optional[T]) UnmarshalJSON(dat []byte) error { |