From d610858144383af52a066962dd22628482fdfa8b Mon Sep 17 00:00:00 2001
From: Jacob Lifshay <programmerjake@gmail.com>
Date: Tue, 16 Jul 2024 16:51:54 -0700
Subject: [PATCH] move Value derive macro re-export to same place as Value
 trait

---
 crates/fayalite/src/clock.rs             | 2 +-
 crates/fayalite/src/enum_.rs             | 2 +-
 crates/fayalite/src/lib.rs               | 2 +-
 crates/fayalite/src/ty.rs                | 2 +-
 crates/fayalite/tests/module.rs          | 2 +-
 crates/fayalite/tests/ui/value_derive.rs | 2 +-
 crates/fayalite/tests/value_derive.rs    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/crates/fayalite/src/clock.rs b/crates/fayalite/src/clock.rs
index 339d8ad..808e54b 100644
--- a/crates/fayalite/src/clock.rs
+++ b/crates/fayalite/src/clock.rs
@@ -102,7 +102,7 @@ impl CanonicalValue for Clock {
     }
 }
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, crate::Value)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Value)]
 #[hdl(fixed_type, outline_generated)]
 pub struct ClockDomain {
     pub clock: Clock,
diff --git a/crates/fayalite/src/enum_.rs b/crates/fayalite/src/enum_.rs
index 0699109..6b9c104 100644
--- a/crates/fayalite/src/enum_.rs
+++ b/crates/fayalite/src/enum_.rs
@@ -611,7 +611,7 @@ impl CanonicalValue for DynEnum {
 
 mod impl_option {
     #[allow(dead_code)]
-    #[derive(crate::Value)]
+    #[derive(crate::ty::Value)]
     #[hdl(target(std::option::Option), connect_inexact, outline_generated)]
     pub enum Option<T> {
         None,
diff --git a/crates/fayalite/src/lib.rs b/crates/fayalite/src/lib.rs
index 51a8999..0108e96 100644
--- a/crates/fayalite/src/lib.rs
+++ b/crates/fayalite/src/lib.rs
@@ -5,7 +5,7 @@ extern crate self as fayalite;
 #[doc(hidden)]
 pub use std as __std;
 
-pub use fayalite_proc_macros::{hdl_module, Value};
+pub use fayalite_proc_macros::hdl_module;
 
 pub mod annotations;
 pub mod array;
diff --git a/crates/fayalite/src/ty.rs b/crates/fayalite/src/ty.rs
index 2d55206..f8e8149 100644
--- a/crates/fayalite/src/ty.rs
+++ b/crates/fayalite/src/ty.rs
@@ -28,7 +28,7 @@ use std::{
     sync::Arc,
 };
 
-pub use crate::Value;
+pub use fayalite_proc_macros::Value;
 
 mod sealed {
     pub trait Sealed {}
diff --git a/crates/fayalite/tests/module.rs b/crates/fayalite/tests/module.rs
index 1fb356a..908dac3 100644
--- a/crates/fayalite/tests/module.rs
+++ b/crates/fayalite/tests/module.rs
@@ -12,7 +12,7 @@ use fayalite::{
     module::transform::simplify_enums::{simplify_enums, SimplifyEnumsKind},
     reset::{SyncReset, ToReset},
     source_location::SourceLocation,
-    Value,
+    ty::Value,
 };
 use serde_json::json;
 
diff --git a/crates/fayalite/tests/ui/value_derive.rs b/crates/fayalite/tests/ui/value_derive.rs
index cf64752..1cbfde4 100644
--- a/crates/fayalite/tests/ui/value_derive.rs
+++ b/crates/fayalite/tests/ui/value_derive.rs
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // See Notices.txt for copyright information
-use fayalite::Value;
+use fayalite::ty::Value;
 
 #[derive(Value)]
 union U {
diff --git a/crates/fayalite/tests/value_derive.rs b/crates/fayalite/tests/value_derive.rs
index eaab4e6..10f632c 100644
--- a/crates/fayalite/tests/value_derive.rs
+++ b/crates/fayalite/tests/value_derive.rs
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // See Notices.txt for copyright information
-use fayalite::{int::UInt, Value};
+use fayalite::{int::UInt, ty::Value};
 
 #[derive(Value, Clone, Hash, PartialEq, Eq, Debug)]
 #[hdl(outline_generated)]