From 76fc2ac367e2b6abee9f9aa55a291287ddd7b022 Mon Sep 17 00:00:00 2001
From: Jan Mas Rovira <janmasrovira@gmail.com>
Date: Thu, 16 Jan 2025 12:43:53 +0100
Subject: [PATCH 1/3] fix Field/Base

---
 Stdlib/Data/Field/Base.juvix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Stdlib/Data/Field/Base.juvix b/Stdlib/Data/Field/Base.juvix
index c23eae15..9ad01840 100644
--- a/Stdlib/Data/Field/Base.juvix
+++ b/Stdlib/Data/Field/Base.juvix
@@ -1,8 +1,8 @@
 module Stdlib.Data.Field.Base;
 
 import Stdlib.Data.Fixity open;
-import Stdlib.Data.Nat.Base open;
-import Stdlib.Data.Int.Base open hiding {toNat};
+import Stdlib.Data.Nat.Base open hiding {+; *};
+import Stdlib.Data.Int.Base open hiding {toNat; +; -; *};
 import Stdlib.Data.Bool.Base open;
 
 builtin field

From 233c7eb5463182a24dc12010b5e2b400d91f8367 Mon Sep 17 00:00:00 2001
From: Jan Mas Rovira <janmasrovira@gmail.com>
Date: Thu, 16 Jan 2025 19:51:51 +0100
Subject: [PATCH 2/3] fix Data/Set

---
 Stdlib/Data/Set.juvix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Stdlib/Data/Set.juvix b/Stdlib/Data/Set.juvix
index ce2350d2..dd31c0f8 100644
--- a/Stdlib/Data/Set.juvix
+++ b/Stdlib/Data/Set.juvix
@@ -15,7 +15,7 @@ import Stdlib.Data.Nat open;
 import Stdlib.Data.Int open;
 import Stdlib.Data.Bool open;
 import Stdlib.Data.Pair open;
-import Stdlib.Data.List open using {List; nil; ::; filter; ++; catMaybes};
+import Stdlib.Data.List open using {List; nil; ::; ++; catMaybes};
 import Stdlib.Data.String open;
 import Stdlib.Trait.Foldable open hiding {foldr; foldl};
 import Stdlib.Function open;

From f73c9330b34019b2f6cf5033521eeb4764835dfb Mon Sep 17 00:00:00 2001
From: Jan Mas Rovira <janmasrovira@gmail.com>
Date: Thu, 16 Jan 2025 20:05:19 +0100
Subject: [PATCH 3/3] fix Data/Map

---
 Stdlib/Data/Map.juvix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Stdlib/Data/Map.juvix b/Stdlib/Data/Map.juvix
index ed2d822d..912934df 100644
--- a/Stdlib/Data/Map.juvix
+++ b/Stdlib/Data/Map.juvix
@@ -3,7 +3,7 @@ module Stdlib.Data.Map;
 import Stdlib.Data.Pair open;
 import Stdlib.Data.Maybe open;
 import Stdlib.Data.Result open;
-import Stdlib.Data.List open;
+import Stdlib.Data.List open hiding {all; any; filter; partition};
 import Stdlib.Data.Nat open;
 import Stdlib.Data.Bool open;