cleanup

distribution/lib/Standard/AWS/0.0.0-dev/src/Internal/S3_Path.enso

@@ -2,7 +2,6 @@ from Standard.Base import all
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 import Standard.Base.Internal.Ordering_Helpers.Default_Comparator
 import Standard.Base.Internal.Path_Helpers
-from Standard.Base.Data.Ordering import comparable_via
 
 import project.Errors.S3_Error
 import project.S3.S3
@@ -160,10 +159,8 @@ type Decomposed_S3_Path
             Decomposed_S3_Path.Value new_parts self.go_to_root
 
 S3_Path_Comparator =
-    compare x y =
-        Ordering.compare [x.bucket, x.key] [y.bucket, y.key]
+    compare x y = Ordering.compare [x.bucket, x.key] [y.bucket, y.key]
 
     hash x = Default_Comparator.hash_builtin x
 
-#Comparable.from that:S3_Path = Comparable.new that S3_Path_Comparator
-Comparable.from that:S3_Path = comparable_via (p-> [p.bucket, p.key])
+Comparable.from that:S3_Path = Comparable.new that S3_Path_Comparator

distribution/lib/Standard/AWS/0.0.0-dev/src/S3/S3_File.enso

@@ -179,16 +179,15 @@ type S3_File
             check_recursion action = if recursive then Unimplemented.throw "S3 listing with recursion is not currently implemented." else action
             check_directory action = if self.is_directory.not then Error.throw (Illegal_Argument.Error "Cannot `list` a non-directory." self.uri) else action
 
-            results = check_directory <| check_recursion <| check_name_filter <|
+            check_directory <| check_recursion <| check_name_filter <|
                 if self.s3_path.bucket == "" then translate_file_errors self <| S3.list_buckets self.credentials . map bucket-> S3_File.Value (S3_Path.Value bucket "") self.credentials else
                     pair = translate_file_errors self <| S3.read_bucket self.s3_path.bucket self.s3_path.key self.credentials delimiter=S3_Path.delimiter
                     bucket = self.s3_path.bucket
                     sub_folders = pair.first . map key->
                         S3_File.Value (S3_Path.Value bucket key) self.credentials
                     files = pair.second . map key->
                         S3_File.Value (S3_Path.Value bucket key) self.credentials
-                    sub_folders + files
-            results.sort on=.path
+                    sub_folders + files . sort on=.s3_path
 
     ## ALIAS load bytes, open bytes
        ICON data_input
@@ -617,11 +616,3 @@ translate_file_errors related_file result =
         s3_path = S3_Path.Value error.bucket error.key
         s3_file = S3_File.Value s3_path related_file.credentials
         Error.throw (File_Error.Not_Found s3_file)
-
-## PRIVATE
-   Sort S3 files by bucket and path.
-sort_s3_files s3_files =
-    s3_file_sort_key s3_file =
-        s3_path = s3_file.path
-        [s3_path.bucket, s3.path.key]
-    s3_files.sort on=s3_file_sort_key

distribution/lib/Standard/Base/0.0.0-dev/src/Data/Ordering.enso

@@ -193,14 +193,5 @@ type Ordering
     from_sign sign = if sign == 0 then Ordering.Equal else
         if sign > 0 then Ordering.Greater else Ordering.Less
 
-type Via_Comparator
-    Value f
-
-    compare self x y = Ordering.compare (self.f x) (self.f y)
-
-    hash x = Default_Comparator.hash_builtin x
-
-comparable_via that f = Comparable.new that (Via_Comparator.Value f)
-
 ## PRIVATE
 Comparable.from (that:Ordering) = Comparable.new that Ordering_Comparator

distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Internal/Enso_Path.enso

@@ -13,7 +13,6 @@ import project.Internal.Ordering_Helpers.Default_Comparator
 import project.Internal.Path_Helpers
 import project.Nothing.Nothing
 from project.Data.Boolean import Boolean, False, True
-from project.Data.Ordering import comparable_via
 from project.Data.Text.Extensions import all
 
 ## PRIVATE
@@ -77,11 +76,9 @@ normalize segments =
            that points to the user home and it should be correctly normalized, but requires numerous passes to do so.
         @Tail_Call normalize new_segments
 
-type Enso_File_Comparator
-    compare x y =
-        Ordering.compare x.path_segments y.path_segments
+type Enso_Path_Comparator
+    compare x y = Ordering.compare x.path_segments y.path_segments
 
     hash x = Default_Comparator.hash_builtin x
 
-#Comparable.from that:Enso_File = Comparable.new that Enso_File_Comparator
-Comparable.from that:Enso_File = comparable_via that .path_segments
+Comparable.from that:Enso_Path = Comparable.new that Enso_Path_Comparator

test/AWS_Tests/src/S3_Spec.enso

@@ -264,7 +264,8 @@ add_specs suite_builder =
         group_builder.specify "list should sort its output" <|
             r = root.list
             r.should_be_a Vector
-            r . should_equal r.sort
+            r . should_equal (r.sort on=.s3_path)
+            r . should_equal (r.sort on=(x-> x.s3_path.to_text))
 
         group_builder.specify "will fail if no credentials are provided and no Default credentials are available" pending=(if AWS_Credential.is_default_credential_available then "Default AWS credentials are defined in the environment and this test has no way of overriding them, so it is impossible to test this scenario in such environment.") <|
             root_without_credentials = S3_File.new "s3://"+bucket_name+"/"

test/Base_Tests/src/Network/Enso_Cloud/Enso_File_Spec.enso

@@ -44,7 +44,8 @@ add_specs suite_builder setup:Cloud_Tests_Setup = suite_builder.group "Enso Clou
     group_builder.specify "list should sort its output" <|
         r = Enso_File.home.list
         r.should_be_a Vector
-        r . should_equal r.sort
+        r . should_equal (r.sort on=.path)
+        r . should_equal (r.sort on=.enso_path)
 
     group_builder.specify "should allow to create and delete a directory" <|
         my_name = "my_test_dir-" + (Random.uuid.take 5)