From 65b7d4221b90445bfc089873092411cf7e322933 Mon Sep 17 00:00:00 2001 From: Baibhav Vatsa Date: Fri, 11 Oct 2019 13:51:24 -0500 Subject: [PATCH] tpl: Modify error messages of after, first, and last Modified the messages functions after, first, and last threw on being passed invalid parameters (index or limit) to be more standardised and resemble what Go compiler would throw. Fixes #6415 --- tpl/collections/collections.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tpl/collections/collections.go b/tpl/collections/collections.go index 95079436..df8aaa6c 100644 --- a/tpl/collections/collections.go +++ b/tpl/collections/collections.go @@ -61,7 +61,7 @@ func (ns *Namespace) After(index interface{}, seq interface{}) (interface{}, err } if indexv < 0 { - return nil, errors.New("can't return negative/empty count of items from sequence") + return nil, errors.New("sequence bounds out of range [" + cast.ToString(indexv) + ":]") } seqv := reflect.ValueOf(seq) @@ -219,7 +219,7 @@ func (ns *Namespace) First(limit interface{}, seq interface{}) (interface{}, err } if limitv < 0 { - return nil, errors.New("can't return negative count of items from sequence") + return nil, errors.New("sequence length must be non-negative") } seqv := reflect.ValueOf(seq) @@ -379,7 +379,7 @@ func (ns *Namespace) Last(limit interface{}, seq interface{}) (interface{}, erro } if limitv < 0 { - return nil, errors.New("can't return negative/empty count of items from sequence") + return nil, errors.New("sequence length must be non-negative") } seqv := reflect.ValueOf(seq) -- 2.30.2