Skip to content

Commit

Permalink
Fix up some failures from #21633 and #21733 (#21741)
Browse files Browse the repository at this point in the history
[trivial, not reviewed]

This fixes a few futures that I must've missed in my last paratest run
(prior to paratest running futures by default!) as well as an obvious
problem with the test of the bash autocompletion which I'm not sure how
it slipped past me.

It also fixes an issue from Ben McDonald's #21733 which I happened to
notice since he's likely out for the evening.

While here, I noticed that an erroneous condition that I'd noted earlier
in #21652 has been resolved, probably by #21614 as Michael predicted, so
I added a compopts line to lock that behavior in (and removed another
that, in retrospect, felt overly paranoid).
  • Loading branch information
bradcray committed Mar 3, 2023
2 parents 958c2b9 + 1ea85a6 commit e81c083
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
1 change: 0 additions & 1 deletion test/arrays/bradc/noelemtype.bad
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
noelemtype.chpl:5: warning: single-element array literals without a trailing comma are deprecated; please rewrite as '[myElem, ]'
noelemtype.chpl:5: error: cannot initialize [domain(1,int(64),false)] domain(1,int(64),false) from real(64)
2 changes: 1 addition & 1 deletion test/arrays/dinan/no_element_type_error.bad
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
no_element_type_error.chpl:2: warning: single-element array literals without a trailing comma are deprecated; please rewrite as '[myElem, ]'
no_element_type_error.chpl:2: warning: please note that this is a 1-element array of ranges; if that was your intention, add a trailing comma or recompile with '--no-warn-array-of-range' to avoid this warning; if it wasn't, you may want to use a range instead
no_element_type_error.chpl:2: error: cannot initialize [domain(1,int(64),false)] range(int(64),bounded,false) from [domain(1,int(64),false)] real(64)
2 changes: 1 addition & 1 deletion test/arrays/errors/arrOfRanges.compopts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
--warn-array-of-range # arrOfRanges.good
--no-warn-array-of-range # arrOfRanges-nowarning.good
--no-warnings # arrOfRanges-nowarning.good
--no-warn-array-of-range --warn-array-of-range # arrOfRanges.good
--devel --no-warnings # arrOfRanges-nowarning.good
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
./Aggregator.chpl:36: In initializer:
$CHPL_HOME/modules/standard/Types.chpl:250: warning: Initializing a type-inferred variable from a 'sync' is deprecated; apply a 'read??()' method to the right-hand side
./DistributedMap.chpl:743: called as (aggregator(distributedMapImpl(string,int(64),nothing),proc(ref element: int))).init(clientInst: borrowed distributedMapImpl(string,int(64),nothing), updaterFcf: proc(ref element: int)) from method 'updateAggregator'
./DistributedMap.chpl:716: called as (aggregator(distributedMapImpl(string,int(64),nothing),proc(ref element: int))).init(clientInst: borrowed distributedMapImpl(string,int(64),nothing), updaterFcf: proc(ref element: int)) from method 'updateAggregator'
use-distributed-map.chpl:12: called as (distributedMapImpl(string,int(64),nothing)).updateAggregator(updater: proc(ref element: int))
Jacob=2
Jingleheimer=2
Expand Down
2 changes: 2 additions & 0 deletions util/chpl-completion.bash
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ _chpl ()
--no-use-io-formatters \
--no-vectorize \
--no-verify \
--no-warn-array-of-range \
--no-warn-const-loops \
--no-warn-domain-literal \
--no-warn-int-uint \
Expand Down Expand Up @@ -349,6 +350,7 @@ _chpl ()
--vectorize \
--verify \
--version \
--warn-array-of-range \
--warn-const-loops \
--warn-domain-literal \
--warn-int-uint \
Expand Down

0 comments on commit e81c083

Please sign in to comment.