pkg/ast: remove trailing spaces when formatting

6 files changed, 10 insertions, 9 deletions

diff --git a/pkg/ast/format.go b/pkg/ast/format.go
index 6b16f4015..51538eaf1 100644
--- a/pkg/ast/format.go
+++ b/pkg/ast/format.go
@@ -7,6 +7,7 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"strings"
 )
 
 func Format(desc *Description) []byte {
@@ -70,7 +71,7 @@ func (n *NewLine) serialize(w io.Writer) {
 }
 
 func (n *Comment) serialize(w io.Writer) {
-	fmt.Fprintf(w, "#%v\n", n.Text)
+	fmt.Fprintf(w, "#%v\n", strings.TrimRight(n.Text, " \t"))
 }
 
 func (n *Include) serialize(w io.Writer) {
@@ -138,7 +139,7 @@ func (n *Struct) serialize(w io.Writer) {
 			fmt.Fprintf(w, "\n")
 		}
 		for _, com := range f.Comments {
-			fmt.Fprintf(w, "#%v\n", com.Text)
+			com.serialize(w)
 		}
 		fmt.Fprintf(w, "\t%v\t", f.Name.Name)
 		for tabs := len(f.Name.Name)/tabWidth + 1; tabs < maxTabs; tabs++ {
@@ -151,7 +152,7 @@ func (n *Struct) serialize(w io.Writer) {
 		fmt.Fprintf(w, "\n")
 	}
 	for _, com := range n.Comments {
-		fmt.Fprintf(w, "#%v\n", com.Text)
+		com.serialize(w)
 	}
 	fmt.Fprintf(w, "%c", closing)
 	if attrs := fmtTypeList(n.Attrs, "[", "]"); attrs != "" {
diff --git a/sys/linux/io_uring.txt b/sys/linux/io_uring.txt
index 86e31e251..1452aa122 100644
--- a/sys/linux/io_uring.txt
+++ b/sys/linux/io_uring.txt
@@ -65,7 +65,7 @@ define CQ_RING_ENTRIES_OFFSET	268
 define CQ_RING_OVERFLOW_OFFSET	284
 define CQ_FLAGS_OFFSET	280
 
-# Notice all offsets are pointing to uint32 values. This is assumed for the 
+# Notice all offsets are pointing to uint32 values. This is assumed for the
 io_uring_offsets = SQ_HEAD_OFFSET, SQ_TAIL_OFFSET, SQ_RING_MASK_OFFSET, SQ_RING_ENTRIES_OFFSET, SQ_FLAGS_OFFSET, SQ_DROPPED_OFFSET, CQ_HEAD_OFFSET, CQ_TAIL_OFFSET, CQ_RING_MASK_OFFSET, CQ_RING_ENTRIES_OFFSET, CQ_RING_OVERFLOW_OFFSET, CQ_FLAGS_OFFSET
 
 # Also, all values are int32, thus, set nbytes to 4.
@@ -250,7 +250,7 @@ type io_uring_sqe_tee io_uring_sqe_t[IORING_OP_TEE, const[0, int16], fd_or_fixed
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-# 
+#
 # Flags, enumerations, and misc fields of sqe ops
 #
 
diff --git a/sys/linux/perf.txt b/sys/linux/perf.txt
index fd29a6f1d..9dd565f49 100644
--- a/sys/linux/perf.txt
+++ b/sys/linux/perf.txt
@@ -34,7 +34,7 @@ perf_read_format = PERF_FORMAT_TOTAL_TIME_ENABLED, PERF_FORMAT_TOTAL_TIME_RUNNIN
 perf_branch_sample_type = PERF_SAMPLE_BRANCH_USER, PERF_SAMPLE_BRANCH_KERNEL, PERF_SAMPLE_BRANCH_HV, PERF_SAMPLE_BRANCH_ANY, PERF_SAMPLE_BRANCH_ANY_CALL, PERF_SAMPLE_BRANCH_ANY_RETURN, PERF_SAMPLE_BRANCH_IND_CALL, PERF_SAMPLE_BRANCH_ABORT_TX, PERF_SAMPLE_BRANCH_IN_TX, PERF_SAMPLE_BRANCH_NO_TX, PERF_SAMPLE_BRANCH_COND, PERF_SAMPLE_BRANCH_CALL_STACK, PERF_SAMPLE_BRANCH_IND_JUMP, PERF_SAMPLE_BRANCH_CALL, PERF_SAMPLE_BRANCH_NO_FLAGS, PERF_SAMPLE_BRANCH_NO_CYCLES, PERF_SAMPLE_BRANCH_TYPE_SAVE, PERF_SAMPLE_BRANCH_MAX
 perf_bp_lens = 1, 2, 4, 8
 _ = __NR_mmap2
-#perf_event_attr size 
+#perf_event_attr size
 _ = PERF_ATTR_SIZE_VER0, PERF_ATTR_SIZE_VER1, PERF_ATTR_SIZE_VER2, PERF_ATTR_SIZE_VER3, PERF_ATTR_SIZE_VER4, PERF_ATTR_SIZE_VER5
 #perf_event_attr config field
 _ = PERF_COUNT_HW_CPU_CYCLES, PERF_COUNT_HW_INSTRUCTIONS, PERF_COUNT_HW_CACHE_REFERENCES, PERF_COUNT_HW_CACHE_MISSES, PERF_COUNT_HW_BRANCH_INSTRUCTIONS, PERF_COUNT_HW_BRANCH_MISSES, PERF_COUNT_HW_BUS_CYCLES, PERF_COUNT_HW_STALLED_CYCLES_FRONTEND, PERF_COUNT_HW_STALLED_CYCLES_BACKEND, PERF_COUNT_HW_REF_CPU_CYCLES, PERF_COUNT_HW_MAX
diff --git a/sys/linux/socket_netlink_generic_devlink.txt b/sys/linux/socket_netlink_generic_devlink.txt
index b79379d28..639ad9b3f 100644
--- a/sys/linux/socket_netlink_generic_devlink.txt
+++ b/sys/linux/socket_netlink_generic_devlink.txt
@@ -105,7 +105,7 @@ devlink_trap_set_policy {
 } [packed, align[4]]
 
 # 0 stands for the only invalid policer id, the rest has no special meaning but
-#  used to ease collision in policer ids between system calls. 
+#  used to ease collision in policer ids between system calls.
 trap_policer_ids = 0, 1, 2, 3
 
 devlink_trap_policer_get_policy {
diff --git a/sys/linux/socket_netlink_netfilter_ipset.txt b/sys/linux/socket_netlink_netfilter_ipset.txt
index d1ddc33a1..5d3f4c631 100644
--- a/sys/linux/socket_netlink_netfilter_ipset.txt
+++ b/sys/linux/socket_netlink_netfilter_ipset.txt
@@ -156,7 +156,7 @@ ip_set_type_adt_policy [
 ] [varlen]
 
 ipaddr_policy [
-# TODO: should ipv4_addr be in reverse byte order here? 
+# TODO: should ipv4_addr be in reverse byte order here?
 	IPSET_ATTR_IPADDR_IPV4	nlnetw[IPSET_ATTR_IPADDR_IPV4, ipv4_addr]
 	IPSET_ATTR_IPADDR_IPV6	nlnetw[IPSET_ATTR_IPADDR_IPV6, ipv6_addr]
 ] [varlen]
diff --git a/sys/linux/sys.txt b/sys/linux/sys.txt
index c55f9573b..19062d7d5 100644
--- a/sys/linux/sys.txt
+++ b/sys/linux/sys.txt
@@ -394,7 +394,7 @@ ioprio_set$uid(which flags[ioprio_which_uid], who uid, ioprio flags[ioprio_prior
 
 # NEED: we can express the construction of integers using structs with flags
 # and bitfields, which are normally obtained using a combination of bitwise
-# operations with the help of macros. However, structs can't be directly passed 
+# operations with the help of macros. However, structs can't be directly passed
 # as a syscall argument; therefore, such constructions can't be directly passed either.
 # One example is ioprio argument for ioprio_set, where we could have expressed the
 # construction less messy. For now, some subset of valid values are enumerated as