3 files changed, 18 insertions, 3 deletions
diff --git a/pkg/segment/range.go b/pkg/segment/range.go
index 4d4aeffef..b6fa96e81 100644
--- a/pkg/segment/range.go
+++ b/pkg/segment/range.go
@@ -30,27 +30,37 @@ type Range struct {
 
 // WellFormed returns true if r.Start <= r.End. All other methods on a Range
 // require that the Range is well-formed.
+//
+//go:nosplit
 func (r Range) WellFormed() bool {
 	return r.Start <= r.End
 }
 
 // Length returns the length of the range.
+//
+//go:nosplit
 func (r Range) Length() T {
 	return r.End - r.Start
 }
 
 // Contains returns true if r contains x.
+//
+//go:nosplit
 func (r Range) Contains(x T) bool {
 	return r.Start <= x && x < r.End
 }
 
 // Overlaps returns true if r and r2 overlap.
+//
+//go:nosplit
 func (r Range) Overlaps(r2 Range) bool {
 	return r.Start < r2.End && r2.Start < r.End
 }
 
 // IsSupersetOf returns true if r is a superset of r2; that is, the range r2 is
 // contained within r.
+//
+//go:nosplit
 func (r Range) IsSupersetOf(r2 Range) bool {
 	return r.Start <= r2.Start && r.End >= r2.End
 }
@@ -58,6 +68,8 @@ func (r Range) IsSupersetOf(r2 Range) bool {
 // Intersect returns a range consisting of the intersection between r and r2.
 // If r and r2 do not overlap, Intersect returns a range with unspecified
 // bounds, but for which Length() == 0.
+//
+//go:nosplit
 func (r Range) Intersect(r2 Range) Range {
 	if r.Start < r2.Start {
 		r.Start = r2.Start
@@ -74,6 +86,8 @@ func (r Range) Intersect(r2 Range) Range {
 // CanSplitAt returns true if it is legal to split a segment spanning the range
 // r at x; that is, splitting at x would produce two ranges, both of which have
 // non-zero length.
+//
+//go:nosplit
 func (r Range) CanSplitAt(x T) bool {
 	return r.Contains(x) && r.Start < x
 }
diff --git a/pkg/segment/set.go b/pkg/segment/set.go
index fbb31dbea..fae6c363d 100644
--- a/pkg/segment/set.go
+++ b/pkg/segment/set.go
@@ -1680,8 +1680,8 @@ type SegmentDataSlices struct {
 	Values []Value
 }
 
-// ExportSortedSlice returns a copy of all segments in the given set, in ascending
-// key order.
+// ExportSortedSlices returns a copy of all segments in the given set, in
+// ascending key order.
 func (s *Set) ExportSortedSlices() *SegmentDataSlices {
 	var sds SegmentDataSlices
 	for seg := s.FirstSegment(); seg.Ok(); seg = seg.NextSegment() {
@@ -1695,7 +1695,7 @@ func (s *Set) ExportSortedSlices() *SegmentDataSlices {
 	return &sds
 }
 
-// ImportSortedSlice initializes the given set from the given slice.
+// ImportSortedSlices initializes the given set from the given slice.
 //
 // Preconditions:
 // * s must be empty.
diff --git a/pkg/segment/test/set_functions.go b/pkg/segment/test/set_functions.go
index 7cd895cc7..652c010da 100644
--- a/pkg/segment/test/set_functions.go
+++ b/pkg/segment/test/set_functions.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Package segment is a test package.
 package segment
 
 type setFunctions struct{}