From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Fri, 17 Jan 2020 14:14:33 +0000 (+0000)
Subject: update to new revision nmigen
X-Git-Tag: ls180-24jan2020~353
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eaadfbd75fa36c3f5c0e0f0f564a2a5b1ad61052;p=ieee754fpu.git

update to new revision nmigen
---

diff --git a/src/nmutil/nmoperator.py b/src/nmutil/nmoperator.py
index 87bc1898..fd50d2f5 100644
--- a/src/nmutil/nmoperator.py
+++ b/src/nmutil/nmoperator.py
@@ -164,7 +164,7 @@ def shape(i):
 def cat(i):
     """ flattens a compound structure recursively using Cat
     """
-    from nmigen.tools import flatten
+    from nmigen._utils import flatten
     #res = list(flatten(i)) # works (as of nmigen commit f22106e5) HOWEVER...
     res = list(Visitor().iterate(i)) # needed because input may be a sequence
     return Cat(*res)
diff --git a/src/nmutil/queue.py b/src/nmutil/queue.py
index 069aa22c..3d47c639 100644
--- a/src/nmutil/queue.py
+++ b/src/nmutil/queue.py
@@ -24,7 +24,7 @@
 # MODIFICATIONS.
 
 from nmigen import Module, Signal, Memory, Mux, Elaboratable
-from nmigen.tools import bits_for
+from nmigen.utils import bits_for
 from nmigen.cli import main
 from nmigen.lib.fifo import FIFOInterface