From 79ded694d7f913755dc7261c7468f04fe421e0b3 Mon Sep 17 00:00:00 2001
From: Timothee Cour <timothee.cour2@gmail.com>
Date: Wed, 9 Jun 2021 22:00:34 -0700
Subject: [PATCH] avoid re-exporting options from std/wrapnils (#18222)

---
 lib/std/wrapnils.nim       | 2 +-
 tests/stdlib/twrapnils.nim | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/std/wrapnils.nim b/lib/std/wrapnils.nim
index 708faf4cf8..ed0a79d798 100644
--- a/lib/std/wrapnils.nim
+++ b/lib/std/wrapnils.nim
@@ -25,7 +25,6 @@ runnableExamples:
   assert (?.f2.x2.x2).x3 == nil  # this terminates ?. early
 
 from options import Option, isSome, get, option, unsafeGet, UnpackDefect
-export options.get, options.isSome, options.isNone
 
 template fakeDot*(a: Option, b): untyped =
   ## See top-level example.
@@ -90,6 +89,7 @@ macro `?.`*(a: untyped): auto =
 macro `??.`*(a: untyped): Option =
   ## Same as `?.` but returns an `Option`.
   runnableExamples:
+    import std/options
     type Foo = ref object
       x1: ref int
       x2: int
diff --git a/tests/stdlib/twrapnils.nim b/tests/stdlib/twrapnils.nim
index af0978762d..9562043554 100644
--- a/tests/stdlib/twrapnils.nim
+++ b/tests/stdlib/twrapnils.nim
@@ -1,4 +1,5 @@
 import std/wrapnils
+from std/options import get, isSome
 
 proc checkNotZero(x: float): float =
   doAssert x != 0