1 files changed, 20 insertions, 17 deletions
diff --git a/src/Data/Array/Nested.hs b/src/Data/Array/Nested.hs
index 9801529..c3635e9 100644
--- a/src/Data/Array/Nested.hs
+++ b/src/Data/Array/Nested.hs
@@ -10,8 +10,9 @@ module Data.Array.Nested (
   rtranspose, rappend, rconcat, rscalar, rfromVector, rtoVector, runScalar,
   remptyArray,
   rrerank,
-  rreplicate, rreplicateScal, rfromListOuter, rfromList1, rfromList1Prim, rtoListOuter, rtoList1,
-  rfromListLinear, rfromListPrimLinear, rtoListLinear,
+  rreplicate, rreplicateScal,
+  rfromList1, rfromListOuter, rfromListLinear, rfromListPrim, rfromListPrimLinear,
+  rtoList, rtoListOuter, rtoListLinear,
   rslice, rrev1, rreshape, rflatten, riota,
   rminIndexPrim, rmaxIndexPrim, rdot1Inner, rdot,
   rnest, runNest, rzip, runzip,
@@ -19,7 +20,7 @@ module Data.Array.Nested (
   rlift, rlift2,
   -- ** Conversions
   rtoXArrayPrim, rfromXArrayPrim,
-  rcastToShaped, rtoMixed, rcastToMixed,
+  rtoMixed, rcastToMixed, rcastToShaped,
   rfromOrthotope, rtoOrthotope,
   -- ** Additional arithmetic operations
   --
@@ -36,8 +37,9 @@ module Data.Array.Nested (
   -- TODO: sconcat? What should its type be?
   semptyArray,
   srerank,
-  sreplicate, sreplicateScal, sfromListOuter, sfromList1, sfromList1Prim, stoListOuter, stoList1,
-  sfromListLinear, sfromListPrimLinear, stoListLinear,
+  sreplicate, sreplicateScal,
+  sfromList1, sfromListOuter, sfromListLinear, sfromListPrim, sfromListPrimLinear,
+  stoList, stoListOuter, stoListLinear,
   sslice, srev1, sreshape, sflatten, siota,
   sminIndexPrim, smaxIndexPrim, sdot1Inner, sdot,
   snest, sunNest, szip, sunzip,
@@ -45,7 +47,7 @@ module Data.Array.Nested (
   slift, slift2,
   -- ** Conversions
   stoXArrayPrim, sfromXArrayPrim,
-  stoRanked, stoMixed, scastToMixed,
+  stoMixed, scastToMixed, stoRanked,
   sfromOrthotope, stoOrthotope,
   -- ** Additional arithmetic operations
   --
@@ -63,8 +65,9 @@ module Data.Array.Nested (
   mtranspose, mappend, mconcat, mscalar, mfromVector, mtoVector, munScalar,
   memptyArray,
   mrerank,
-  mreplicate, mreplicateScal, mfromListOuter, mfromList1, mfromList1Prim, mtoListOuter, mtoList1,
-  mfromListLinear, mfromListPrimLinear, mtoListLinear,
+  mreplicate, mreplicateScal,
+  mfromList1, mfromListOuter, mfromListLinear, mfromListPrim, mfromListPrimLinear,
+  mtoList, mtoListOuter, mtoListLinear,
   mslice, mrev1, mreshape, mflatten, miota,
   mminIndexPrim, mmaxIndexPrim, mdot1Inner, mdot,
   mnest, munNest, mzip, munzip,
@@ -73,8 +76,8 @@ module Data.Array.Nested (
   -- ** Conversions
   mtoXArrayPrim, mfromXArrayPrim,
   mcast,
-  mtoRanked, mcastToShaped,
-  castCastable, Castable(..),
+  mcastToShaped, mtoRanked,
+  convert, Conversion(..),
   -- ** Additional arithmetic operations
   --
   -- $integralRealFloat
@@ -102,23 +105,23 @@ module Data.Array.Nested (
 
 import Prelude hiding (mappend, mconcat)
 
-import Data.Array.Nested.Permutation
-import Data.Array.Nested.Types
 import Data.Array.Nested.Convert
 import Data.Array.Nested.Mixed
-import Data.Array.Nested.Ranked
-import Data.Array.Nested.Shaped
 import Data.Array.Nested.Mixed.Shape
+import Data.Array.Nested.Permutation
+import Data.Array.Nested.Ranked
 import Data.Array.Nested.Ranked.Shape
+import Data.Array.Nested.Shaped
 import Data.Array.Nested.Shaped.Shape
+import Data.Array.Nested.Types
 import Data.Array.Strided.Arith
 import Foreign.Storable
 import GHC.TypeLits
 
 -- $integralRealFloat
 --
--- These functions separate top-level functions, and not exposed in instances
--- for 'RealFloat' and 'Integral', because those classes include a variety of
--- other functions that make no sense for arrays.
+-- These functions are separate top-level functions, and not exposed in
+-- instances for 'RealFloat' and 'Integral', because those classes include a
+-- variety of other functions that make no sense for arrays.
 -- This problem already occurs with 'fromInteger', 'fromRational' and 'pi', but
 -- having 'Num', 'Fractional' and 'Floating' available is just too useful.