Merge pull request #411 from dfinity/ggreif/update-moc-0.7.0

Update `moc` to 0.7.0
dfinity · Aug 27, 2022 · 8940945 · 8940945
2 parents 73d34ad + 0c2eee4
commit 8940945
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ on:
 # Remember to update me in package-set.yml as well
 env:
   vessel_version: "v0.6.3"
-  moc_version: "0.6.30"
+  moc_version: "0.7.0"
 
 jobs:
   tests:

diff --git a/.github/workflows/package-set.yml b/.github/workflows/package-set.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   vessel_version: "v0.6.3"
-  moc_version: "0.6.30"
+  moc_version: "0.7.0"
 
 jobs:
   verify:

diff --git a/src/TrieSet.mo b/src/TrieSet.mo
@@ -26,14 +26,18 @@ module {
 
   /// Put an element into the set.
   public func put<T>(s : Set<T>, x : T, xh : Hash, eq : (T, T) -> Bool) : Set<T> {
-    let (s2, _) = Trie.put<T,()>(s, { key = x; hash = xh }, eq, ());
-    s2
+    // let (s2, _) = Trie.put<T,()>(s, { key = x; hash = xh }, eq, ());
+    // s2
+    s := Trie.put<T,()>(s, { key = x; hash = xh x}, eq, ()).0;
+    s
   };
 
   /// Delete an element from the set.
   public func delete<T>(s : Set<T>, x : T, xh : Hash, eq : (T, T) -> Bool) : Set<T> {
-    let (s2, _) = Trie.remove<T, ()>(s, { key = x; hash = xh }, eq);
-    s2
+    // let (s2, _) = Trie.remove<T, ()>(s, { key = x; hash = xh }, eq);
+    // s2
+    s := Trie.remove<T, ()>(s,  { key = x; hash = xh}, eq).0;
+    s
   };
 
   /// Test if two sets are equal.