From de0c8f8125f9a63f1efb554c3d0e18010079ff46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Inf=C3=BChr?= <dominik.infuehr@gmail.com>
Date: Sun, 16 Feb 2025 20:02:26 +0100
Subject: [PATCH] tests: Some test cleanup

---
 tests/stdlib/iterator-collect-map.dora |  8 ++++----
 tests/stdlib/iterator-collect.dora     | 19 ++++++++++---------
 tests/stdlib/iterator-fold.dora        |  2 --
 tests/stdlib/iterator-reduce.dora      |  2 --
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/tests/stdlib/iterator-collect-map.dora b/tests/stdlib/iterator-collect-map.dora
index 6cdd3f52d..d8106f203 100644
--- a/tests/stdlib/iterator-collect-map.dora
+++ b/tests/stdlib/iterator-collect-map.dora
@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 fn main() {
     let initial = Vec[(Int, String)]::new((1, "one"), (3, "three"));
-    let x = initial.iter().collect[HashMap[Int, String]]();
-    assert(x.size() == 2);
-    assert(x.get(1) == Some[String]("one"));
-    assert(x.get(3) == Some[String]("three"));
+    let map = initial.iter().collect[HashMap[Int, String]]();
+    assert(map.size() == 2);
+    assert(map.get(1) == Some[String]("one"));
+    assert(map.get(3) == Some[String]("three"));
 }
diff --git a/tests/stdlib/iterator-collect.dora b/tests/stdlib/iterator-collect.dora
index 4bca79bb5..74cc1516d 100644
--- a/tests/stdlib/iterator-collect.dora
+++ b/tests/stdlib/iterator-collect.dora
@@ -2,17 +2,18 @@ use std::collections::HashSet;
 
 fn main() {
     let initial = Vec[Int]::new(1, 2, 3, 4, 5);
-    let x = initial.iter().collect[Vec[Int]]();
-    assert(initial !== x);
-    assert(initial == x);
+    let copy = initial.iter().collect[Vec[Int]]();
+    assert(initial !== copy);
+    assert(initial == copy);
 
     let initial = Array[Int]::new(1, 2, 3, 4, 5);
-    let x = initial.iter().collect[Array[Int]]();
-    assert(initial !== x);
-    assert(initial == x);
+    let copy = initial.iter().collect[Array[Int]]();
+    assert(initial !== copy);
+    assert(initial == copy);
 
     let initial = Vec[Int]::new(1, 5, 3, 1, 5);
-    let x = initial.iter().collect[HashSet[Int]]().iter().collect[Vec[Int]]();
-    x.sort();
-    assert(x == Vec[Int]::new(1, 3, 5));
+    let set = initial.iter().collect[HashSet[Int]]();
+    let set_as_vec = set.iter().collect[Vec[Int]]();
+    set_as_vec.sort();
+    assert(set_as_vec == Vec[Int]::new(1, 3, 5));
 }
diff --git a/tests/stdlib/iterator-fold.dora b/tests/stdlib/iterator-fold.dora
index a3ea7b918..9d51ff394 100644
--- a/tests/stdlib/iterator-fold.dora
+++ b/tests/stdlib/iterator-fold.dora
@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 fn main() {
     let x = Vec[Int]::new(1, 2, 3, 4, 5).iter().fold[Int](0, |result: Int, x: Int|: Int { result + x });
     assert(x == 15);
diff --git a/tests/stdlib/iterator-reduce.dora b/tests/stdlib/iterator-reduce.dora
index 37997d003..d3f54f3fb 100644
--- a/tests/stdlib/iterator-reduce.dora
+++ b/tests/stdlib/iterator-reduce.dora
@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 fn main() {
     let x = Vec[Int]::new(1, 2, 3, 4, 5).iter().reduce(|result: Int, x: Int|: Int { result + x });
     assert(x == Some[Int](15));