Make the Sort module an official standard module

doc/rst/meta/modules/packages/Sort.rst

@@ -0,0 +1,6 @@
+.. TODO: remove this stub file after Chapel 2.3
+
+Sort
+====
+
+The Sort module documentation has been moved to the :ref:`standard library documentation <std-sort>`.

doc/rst/meta/modules/standard.rst

@@ -22,6 +22,13 @@ default:
    A subset of the Math symbols <standard/Math>
 
 
+Algorithms
+----------
+.. toctree::
+   :maxdepth: 1
+
+   Sort <standard/Sort>
+
 Data Structures
 ---------------
 

modules/Makefile

@@ -99,6 +99,7 @@ MODULES_TO_DOCUMENT = \
 	standard/Reflection.chpl \
 	standard/Regex.chpl \
 	standard/Set.chpl \
+	standard/Sort.chpl \
 	standard/Subprocess.chpl \
 	standard/Time.chpl \
 	standard/Types.chpl \
@@ -146,7 +147,6 @@ PACKAGES_TO_DOCUMENT = \
 	packages/ReplicatedVar.chpl \
 	packages/Search.chpl \
 	packages/Socket.chpl \
-	packages/Sort.chpl \
 	packages/SortedMap.chpl \
 	packages/SortedSet.chpl \
 	packages/TOML.chpl \

modules/internal/fixInternalDocs.sh

@@ -256,3 +256,13 @@ file=CTypes.rst
 replace "class:: c_ptr" "type:: c_ptr" $file # also gets c_ptrConst
 replace "record:: c_array" "type:: c_array" $file
 ## End of CTypes ##
+
+
+# TODO Remove this after Chapel 2.3 when doc/rst/meta/modules/packages/Sort.rst is removed
+## Sort ##
+file=Sort.rst
+echo ".. _std-sort:" >> $file.tmp
+echo "" >> $file.tmp
+cat $file >> $file.tmp
+mv $file.tmp $file
+## End of Sort ##

modules/packages/Sort.chpl → modules/standard/Sort.chpl

@@ -250,6 +250,7 @@ comparator to the initializer of the module-defined
   writeln(Array);
 
  */
+@unstable("The Sort module interface is unstable")
 module Sort {
 
   private use List;

test/modules/bradc/printModStuff/foo.good

@@ -33,7 +33,7 @@ Parsing module files:
   $CHPL_HOME/modules/standard/IO.chpl
   $CHPL_HOME/modules/standard/MemMove.chpl
   $CHPL_HOME/modules/standard/List.chpl
-  $CHPL_HOME/modules/packages/Sort.chpl
+  $CHPL_HOME/modules/standard/Sort.chpl
   $CHPL_HOME/modules/packages/RangeChunk.chpl
   $CHPL_HOME/modules/packages/Search.chpl
   $CHPL_HOME/modules/packages/CopyAggregation.chpl

test/types/tuple/errors/indexHetTuple.good

@@ -1,5 +1,5 @@
 $CHPL_HOME/modules/internal/ChapelTuple.chpl:nnnn: In method 'this':
 $CHPL_HOME/modules/internal/ChapelTuple.chpl:nnnn: error: invalid access of non-homogeneous tuple by runtime value
-  $CHPL_HOME/modules/packages/Sort.chpl:nnnn: called as ((real(64),int(64))).this(i: int(64)) from function 'msbRadixSortParamLastStartBit'
-  $CHPL_HOME/modules/packages/Sort.chpl:nnnn: called as msbRadixSortParamLastStartBit(Data: [domain(1,int(64),one)] (real(64),int(64)), comparator: ContrivedComparator) from function 'twoArrayRadixSort'
+  $CHPL_HOME/modules/standard/Sort.chpl:nnnn: called as ((real(64),int(64))).this(i: int(64)) from function 'msbRadixSortParamLastStartBit'
+  $CHPL_HOME/modules/standard/Sort.chpl:nnnn: called as msbRadixSortParamLastStartBit(Data: [domain(1,int(64),one)] (real(64),int(64)), comparator: ContrivedComparator) from function 'twoArrayRadixSort'
   indexHetTuple.chpl:35: called as twoArrayRadixSort(Data: [domain(1,int(64),one)] (real(64),int(64)), comparator: ContrivedComparator)

test/unstable/packageModules.chpl

@@ -38,7 +38,6 @@ import RecordParser;
 import ReplicatedVar;
 import Search;
 import Socket;
-import Sort;
 import SortedMap;
 import SortedSet;
 import TOML;

test/unstable/packageModules.good

@@ -38,7 +38,6 @@ packageModules.chpl:XX: warning: RecordParser is unstable
 packageModules.chpl:XX: warning: ReplicatedVar is unstable
 packageModules.chpl:XX: warning: Search is unstable
 packageModules.chpl:XX: warning: Socket is unstable
-packageModules.chpl:XX: warning: Sort is unstable
 packageModules.chpl:XX: warning: SortedMap is unstable
 packageModules.chpl:XX: warning: SortedSet is unstable
 packageModules.chpl:XX: warning: TOML is unstable

test/unstable/sortModule.chpl

@@ -0,0 +1 @@
+use Sort;

test/unstable/sortModule.good

@@ -0,0 +1 @@
+sortModule.chpl:1: warning: The Sort module interface is unstable