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 4f2dfad5fabf17232d6bc81f1b7e91b844604e25..ab691aee0d5b7d83ee0a3cda724f702b2abdb05a 100644 (file)
--- 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 ac95e62273d35beec4ff4409e8a89b5c46cc2f7c..e90da10a56df62348519589b19d3e22a7824119b 100644 (file)
--- 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 cc3587b40ef5b4e2ef906ec3ff045f09c77d2177..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 2808e549c1550d620826ecf23da2d4e36d4ef3d5..ded86cfe5ed6b06b4dc01132d86e736ca0d02544 100644 (file)
--- 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"]