From: whitequark <cz@m-labs.hk>
Date: Fri, 6 Sep 2019 06:47:27 +0000 (+0000)
Subject: Remove nmigen.lib from prelude.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5f2e95b947241347c8d8e4fefd0fa56122e40f0e;p=nmigen.git

Remove nmigen.lib from prelude.

Currently it's just MultiReg, and there's no particularly good reason
to privilege this specific CDC primitive so much.
---

diff --git a/examples/basic/cdc.py b/examples/basic/cdc.py
index 4f2dfad..ab691ae 100644
--- a/examples/basic/cdc.py
+++ b/examples/basic/cdc.py
@@ -1,4 +1,5 @@
 from nmigen import *
+from nmigen.lib.cdc import MultiReg
 from nmigen.cli import main
 
 
diff --git a/nmigen/__init__.py b/nmigen/__init__.py
index ac95e62..e90da10 100644
--- a/nmigen/__init__.py
+++ b/nmigen/__init__.py
@@ -5,4 +5,3 @@ except pkg_resources.DistributionNotFound:
     pass
 
 from .hdl import *
-from .lib import *
diff --git a/nmigen/lib/__init__.py b/nmigen/lib/__init__.py
index cc3587b..e69de29 100644
--- a/nmigen/lib/__init__.py
+++ b/nmigen/lib/__init__.py
@@ -1 +0,0 @@
-from .cdc import MultiReg
diff --git a/nmigen/lib/fifo.py b/nmigen/lib/fifo.py
index 2808e54..ded86cf 100644
--- a/nmigen/lib/fifo.py
+++ b/nmigen/lib/fifo.py
@@ -4,6 +4,7 @@ from .. import *
 from ..asserts import *
 from ..tools import log2_int
 from .coding import GrayEncoder
+from .cdc import MultiReg
 
 
 __all__ = ["FIFOInterface", "SyncFIFO", "SyncFIFOBuffered", "AsyncFIFO", "AsyncFIFOBuffered"]