Merge pull request #2 from dfinity/ryan/publish-mops-merge

Fix merge conflicts in dfinity#618
ZenVoich · Feb 21, 2024 · 8ce22a5 · 8ce22a5
2 parents 8a384da + 9e582d9
commit 8ce22a5
Show file tree

Hide file tree

Showing 24 changed files with 35 additions and 81 deletions.
diff --git a/src/Array.mo b/src/Array.mo
@@ -453,8 +453,6 @@ module {
   /// *Runtime and space assumes that `f` runs in O(1) time and space.
   public func mapResult<X, Y, E>(array : [X], f : X -> Result.Result<Y, E>) : Result.Result<[Y], E> {
     let size = array.size();
-    var target : [var Y] = [var];
-    var isInit = false;
 
     var error : ?Result.Result<[Y], E> = null;
     let results = Prim.Array_tabulate<?Y>(

diff --git a/src/Char.mo b/src/Char.mo
@@ -17,10 +17,10 @@ module {
   public let toText : (c : Char) -> Text = Prim.charToText;
 
   // Not exposed pending multi-char implementation.
-  private let toUpper : (c : Char) -> Char = Prim.charToUpper;
+  private let _toUpper : (c : Char) -> Char = Prim.charToUpper;
 
   // Not exposed pending multi-char implementation.
-  private let toLower : (c : Char) -> Char = Prim.charToLower;
+  private let _toLower : (c : Char) -> Char = Prim.charToLower;
 
   /// Returns `true` when `c` is a decimal digit between `0` and `9`, otherwise `false`.
   public func isDigit(c : Char) : Bool {

diff --git a/src/HashMap.mo b/src/HashMap.mo
@@ -87,7 +87,7 @@ module {
     public func get(key : K) : (value : ?V) {
       let h = Prim.nat32ToNat(keyHash(key));
       let m = table.size();
-      let v = if (m > 0) {
+      if (m > 0) {
         AssocList.find<Key<K>, V>(table[h % m], keyHash_(key), keyHashEq)
       } else {
         null

diff --git a/src/Iter.mo b/src/Iter.mo
@@ -196,7 +196,7 @@ module {
   /// ```
   public func toArray<A>(xs : Iter<A>) : [A] {
     let buffer = Buffer.Buffer<A>(8);
-    iterate(xs, func(x : A, ix : Nat) { buffer.add(x) });
+    iterate(xs, func(x : A, _ix : Nat) { buffer.add(x) });
     return Buffer.toArray(buffer)
   };
 

diff --git a/src/RBTree.mo b/src/RBTree.mo
@@ -209,7 +209,7 @@ module {
     ///
     /// Note: Creates `O(log(n))` temporary objects that will be collected as garbage.
     public func put(key : K, value : V) {
-      let (t, res) = insert(tree, compare, key, value);
+      let (t, _res) = insert(tree, compare, key, value);
       tree := t
     };
 
@@ -235,7 +235,7 @@ module {
     ///
     /// Note: Creates `O(log(n))` temporary objects that will be collected as garbage.
     public func delete(key : K) {
-      let (res, t) = removeRec(key, compare, tree);
+      let (_res, t) = removeRec(key, compare, tree);
       tree := t
     };
 

diff --git a/src/Trie.mo b/src/Trie.mo
@@ -203,7 +203,7 @@ module {
           let len = List.size(l.keyvals);
           len <= MAX_LEAF_SIZE and len == l.size and List.all(
             l.keyvals,
-            func((k : Key<K>, v : V)) : Bool { ((k.hash & mask) == bits) }
+            func((k : Key<K>, _v : V)) : Bool { ((k.hash & mask) == bits) }
           )
         };
         case (#branch b) {
@@ -483,7 +483,7 @@ module {
   func splitAssocList<K, V>(al : AssocList<Key<K>, V>, bitpos : Nat) : (AssocList<Key<K>, V>, AssocList<Key<K>, V>) =
     List.partition(
       al,
-      func((k : Key<K>, v : V)) : Bool = not Hash.bit(k.hash, bitpos)
+      func((k : Key<K>, _v : V)) : Bool = not Hash.bit(k.hash, bitpos)
     );
 
   func splitList<K, V>(l : AssocList<Key<K>, V>, bitpos : Nat) : (Nat, AssocList<Key<K>, V>, Nat, AssocList<Key<K>, V>) {
@@ -585,8 +585,6 @@ module {
   /// var mergedTrie = Trie.mergeDisjoint(trie, trie2, Text.equal);
   /// ```
   public func mergeDisjoint<K, V>(tl : Trie<K, V>, tr : Trie<K, V>, k_eq : (K, K) -> Bool) : Trie<K, V> {
-    let key_eq = equalKey(k_eq);
-
     func rec(bitpos : Nat, tl : Trie<K, V>, tr : Trie<K, V>) : Trie<K, V> =
       switch (tl, tr) {
         case (#empty, _) { return tr };
@@ -964,7 +962,7 @@ module {
       tl : Trie<K1, V1>,
       tr : Trie<K2, V2>,
       op : (K1, V1, K2, V2) -> ?(K3, V3),
-      k3_eq : (K3, K3) -> Bool
+      _k3_eq : (K3, K3) -> Bool
     ) : Build<K3, V3> {
 
       func bin(a : Build<K3, V3>, b : Build<K3, V3>) : Build<K3, V3> = seq(a, b);
@@ -1565,7 +1563,7 @@ module {
   /// trie.
   public func mergeDisjoint2D<K1, K2, V>(
     t : Trie2D<K1, K2, V>,
-    k1_eq : (K1, K1) -> Bool,
+    _k1_eq : (K1, K1) -> Bool,
     k2_eq : (K2, K2) -> Bool
   ) : Trie<K2, V> =
     foldUp(

diff --git a/test/Array.test.mo b/test/Array.test.mo
@@ -3,7 +3,6 @@ import Int "../src/Int";
 import Char "../src/Char";
 import Nat "../src/Nat";
 import Text "../src/Text";
-import Result "../src/Result";
 import Suite "mo:matchers/Suite";
 import T "mo:matchers/Testable";
 import M "mo:matchers/Matchers";

diff --git a/test/Buffer.test.mo b/test/Buffer.test.mo
@@ -1,7 +1,5 @@
-import Prim "mo:⛔";
 import B "../src/Buffer";
 import Iter "../src/Iter";
-import Option "../src/Option";
 import Nat "../src/Nat";
 import Hash "../src/Hash";
 import Nat32 "../src/Nat32";

diff --git a/test/Char.test.mo b/test/Char.test.mo
@@ -1,4 +1,3 @@
-import Debug "../src/Debug";
 import Char "../src/Char";
 import Prim "mo:⛔";
 

diff --git a/test/Float.test.mo b/test/Float.test.mo
@@ -63,7 +63,7 @@ func isNegativeZero(number : Float) : Bool {
 };
 
 class PositiveZeroMatcher() : M.Matcher<Float> {
-  public func describeMismatch(number : Float, description : M.Description) {
+  public func describeMismatch(number : Float, _description : M.Description) {
     Debug.print(debug_show (number) # " should be '0.0' (positive zero)")
   };
 
@@ -73,7 +73,7 @@ class PositiveZeroMatcher() : M.Matcher<Float> {
 };
 
 class NegativeZeroMatcher() : M.Matcher<Float> {
-  public func describeMismatch(number : Float, description : M.Description) {
+  public func describeMismatch(number : Float, _description : M.Description) {
     Debug.print(debug_show (number) # " should be '-0.0' (negative zero)")
   };
 
@@ -86,7 +86,7 @@ let noEpsilon = 0.0;
 let smallEpsilon = 1e-6;
 
 class NaNMatcher() : M.Matcher<Float> {
-  public func describeMismatch(number : Float, description : M.Description) {
+  public func describeMismatch(number : Float, _description : M.Description) {
     Debug.print(debug_show (number) # " should be 'nan' or '-nan'")
   };
 
@@ -96,7 +96,7 @@ class NaNMatcher() : M.Matcher<Float> {
 };
 
 class PositiveNaNMatcher() : M.Matcher<Float> {
-  public func describeMismatch(number : Float, description : M.Description) {
+  public func describeMismatch(number : Float, _description : M.Description) {
     Debug.print(debug_show (number) # " should be 'nan' (positive)")
   };
 
@@ -106,7 +106,7 @@ class PositiveNaNMatcher() : M.Matcher<Float> {
 };
 
 class NegativeNaNMatcher() : M.Matcher<Float> {
-  public func describeMismatch(number : Float, description : M.Description) {
+  public func describeMismatch(number : Float, _description : M.Description) {
     Debug.print(debug_show (number) # " should be '-nan' (negative)")
   };
 

diff --git a/test/HashMap.test.mo b/test/HashMap.test.mo
@@ -1,13 +1,8 @@
-import Prim "mo:⛔";
 import HashMap "../src/HashMap";
 import Hash "../src/Hash";
-import Text "../src/Text";
 import Nat "../src/Nat";
 import Array "../src/Array";
 import Iter "../src/Iter";
-import Debug "../src/Debug";
-import Order "../src/Order";
-import Char "../src/Char";
 
 import Suite "mo:matchers/Suite";
 import T "mo:matchers/Testable";

diff --git a/test/LenClamp.test.mo b/test/LenClamp.test.mo
@@ -1,5 +1,4 @@
 import List "../src/List";
-import Trie "../src/Trie";
 import Debug "../src/Debug";
 
 type List<T> = List.List<T>;

diff --git a/test/List.test.mo b/test/List.test.mo
@@ -38,12 +38,14 @@ func opnatEq(a : ?Nat, b : ?Nat) : Bool {
     case (_, _) { false }
   }
 };
-func opnat_isnull(a : ?Nat) : Bool {
-  switch a {
-    case (null) { true };
-    case (?aaa) { false }
-  }
-};
+
+// Temporarily unused because of the comment-disabled test cases below.
+// func opnat_isnull(a : ?Nat) : Bool {
+//   switch a {
+//     case (null) { true };
+//     case (?aaa) { false }
+//   }
+// };
 
 // ## Construction
 let l1 = List.nil<X>();
@@ -69,9 +71,9 @@ assert (opnatEq(List.get<X>(l3, 2), null));
    */
 
 // ## Deconstruction
-let (a1, t1) = List.pop<X>(l3);
+let (a1, _t1) = List.pop<X>(l3);
 assert (opnatEq(a1, ?3));
-let (a2, t2) = List.pop<X>(l2);
+let (a2, _t2) = List.pop<X>(l2);
 assert (opnatEq(a2, ?2));
 let (a3, t3) = List.pop<X>(l1);
 assert (opnatEq(a3, null));

diff --git a/test/Makefile b/test/Makefile
@@ -2,7 +2,7 @@
 
 STDLIB ?= ../src
 MOC ?= moc
-WASMTIME_OPTIONS = --disable-cache --enable-cranelift-nan-canonicalization --wasm-features multi-memory,bulk-memory
+WASMTIME_OPTIONS = -C cache=n -W nan-canonicalization=y -W multi-memory -W bulk-memory
 
 OUTDIR=_out
 
@@ -22,7 +22,7 @@ $(OUTDIR):
 $(OUTDIR)/import_all.mo: $(STDLIB_FILES) | $(OUTDIR)
 	> $@
 	for f in $(patsubst $(STDLIB)/%.mo,%,$(STDLIB_FILES)); do \
-	  echo "import Import_$$f \"mo:base/$$f\";" >> $@; \
+	  echo "import _Import_$$f \"mo:base/$$f\";" >> $@; \
 	done
 
 $(OUTDIR)/%.wasm: %.mo | $(OUTDIR)

diff --git a/test/None.test.mo b/test/None.test.mo
@@ -1,4 +1,3 @@
-import Array "../src/Array";
 import None "../src/None";
 import Debug "../src/Debug";
 

diff --git a/test/RBTree.test.mo b/test/RBTree.test.mo
@@ -15,7 +15,7 @@ let { run; test; suite } = Suite;
 let entryTestable = T.tuple2Testable(T.natTestable, T.textTestable);
 
 class TreeMatcher(expected : [(Nat, Text)]) : M.Matcher<RBTree.RBTree<Nat, Text>> {
-  public func describeMismatch(actual : RBTree.RBTree<Nat, Text>, description : M.Description) {
+  public func describeMismatch(actual : RBTree.RBTree<Nat, Text>, _description : M.Description) {
     Debug.print(debug_show (Iter.toArray(actual.entries())) # " should be " # debug_show (expected))
   };
 
@@ -72,12 +72,6 @@ func insert(tree : RBTree.RBTree<Nat, Text>, key : Nat) {
   checkTree(tree)
 };
 
-func remove(tree : RBTree.RBTree<Nat, Text>, key : Nat) {
-  let value = tree.remove(key);
-  assert (value == ?debug_show (key));
-  checkTree(tree)
-};
-
 func getAll(tree : RBTree.RBTree<Nat, Text>, keys : [Nat]) {
   for (key in keys.vals()) {
     let value = tree.get(key);
@@ -209,6 +203,7 @@ run(
         do {
           let tree = buildTestTree();
           ignore tree.remove(0);
+          checkTree(tree);
           tree
         },
         TreeMatcher([])
@@ -443,6 +438,7 @@ run(
           let tree = buildTestTree();
           let result = tree.remove(1);
           assert (result == ?"1");
+          checkTree(tree);
           tree.remove(1)
         },
         M.equals(T.optional(T.textTestable, null : ?Text))

diff --git a/test/RBTreeMore.test.mo b/test/RBTreeMore.test.mo
@@ -16,10 +16,8 @@ import M "mo:matchers/Matchers";
 
 let { run; test; suite } = Suite;
 
-let entryTestable = T.tuple2Testable(T.natTestable, T.natTestable);
-
 class TreeMatcher(expected : [(Nat, Nat)]) : M.Matcher<RBTree.RBTree<Nat, Nat>> {
-  public func describeMismatch(actual : RBTree.RBTree<Nat, Nat>, description : M.Description) {
+  public func describeMismatch(actual : RBTree.RBTree<Nat, Nat>, _description : M.Description) {
     Debug.print(debug_show (Iter.toArray(actual.entries())) # " should be " # debug_show (expected))
   };
 
@@ -76,19 +74,6 @@ func insert(tree : RBTree.RBTree<Nat, Nat>, key : Nat) {
   checkTree(tree)
 };
 
-func remove(tree : RBTree.RBTree<Nat, Nat>, key : Nat) {
-  let value = tree.remove(key);
-  assert (value == ?key);
-  checkTree(tree)
-};
-
-func getAll(tree : RBTree.RBTree<Nat, Nat>, keys : [Nat]) {
-  for (key in keys.vals()) {
-    let value = tree.get(key);
-    assert (value == ?key)
-  }
-};
-
 func clear(tree : RBTree.RBTree<Nat, Nat>) {
   for ((key, value) in tree.entries()) {
     // stable iteration

diff --git a/test/Random.test.mo b/test/Random.test.mo
@@ -1,4 +1,3 @@
-import Prim "mo:prim";
 import Random "../src/Random";
 import Nat8 "../src/Nat8";
 import Nat16 "../src/Nat16";

diff --git a/test/Result.test.mo b/test/Result.test.mo
@@ -1,7 +1,6 @@
 import Result "../src/Result";
 import Int "../src/Int";
 import Array "../src/Array";
-import List "../src/List";
 
 import Suite "mo:matchers/Suite";
 import M "mo:matchers/Matchers";

diff --git a/test/Stack.test.mo b/test/Stack.test.mo
@@ -1,6 +1,4 @@
 import Stack "../src/Stack";
-import Iter "../src/Iter";
-import O "../src/Option";
 
 import Suite "mo:matchers/Suite";
 import T "mo:matchers/Testable";

diff --git a/test/Text.test.mo b/test/Text.test.mo
@@ -1,6 +1,5 @@
 // @testmode wasi
 
-import Debug "../src/Debug";
 import Text "../src/Text";
 import Blob "../src/Blob";
 import Iter "../src/Iter";
@@ -15,12 +14,6 @@ import T "mo:matchers/Testable";
 
 let { run; test; suite } = Suite;
 
-func charT(c : Char) : T.TestableItem<Char> = {
-  item = c;
-  display = Text.fromChar;
-  equals = Char.equal
-};
-
 func blobT(b : Blob) : T.TestableItem<Blob> = {
   item = b;
   display = func(b : Blob) : Text { debug_show (b) };

diff --git a/test/Trie.test.mo b/test/Trie.test.mo
@@ -1,5 +1,4 @@
 import Trie "../src/Trie";
-import List "../src/List";
 import Nat "../src/Nat";
 import Hash "../src/Hash";
 import Option "../src/Option";
@@ -13,8 +12,6 @@ import Suite "mo:matchers/Suite";
 import T "mo:matchers/Testable";
 import M "mo:matchers/Matchers";
 
-let test = Suite;
-
 func compare (kv1 : (Nat, Nat), kv2 : (Nat, Nat)) : Order.Order {
   Nat.compare(kv1.0, kv2.0)
 };

diff --git a/test/TrieMap.test.mo b/test/TrieMap.test.mo
@@ -428,7 +428,7 @@ func sortedEntries(trie : TrieMap.TrieMap<Nat, Text>) : [(Nat, Text)] {
 };
 
 class TrieMatcher(expected : [(Nat, Text)]) : M.Matcher<TrieMap.TrieMap<Nat, Text>> {
-  public func describeMismatch(actual : TrieMap.TrieMap<Nat, Text>, description : M.Description) {
+  public func describeMismatch(actual : TrieMap.TrieMap<Nat, Text>, _description : M.Description) {
     Prim.debugPrint(debug_show (sortedEntries(actual)) # " should be " # debug_show (expected))
   };