From 4d54f903be0b9a25fef4f976cf3667d2a434e307 Mon Sep 17 00:00:00 2001 From: Jacob Lifshay Date: Fri, 17 Oct 2025 15:00:19 -0700 Subject: [PATCH] move vendor module to top level --- crates/fayalite/src/annotations.rs | 2 +- crates/fayalite/src/build.rs | 2 +- crates/fayalite/src/firrtl.rs | 3 ++- crates/fayalite/src/lib.rs | 1 + crates/fayalite/src/module/transform/deduce_resets.rs | 2 +- crates/fayalite/src/module/transform/visit.rs | 2 +- crates/fayalite/src/{build => }/vendor.rs | 0 crates/fayalite/src/{build => }/vendor/xilinx.rs | 0 .../src/{build => }/vendor/xilinx/yosys_nextpnr_prjxray.rs | 2 +- 9 files changed, 8 insertions(+), 6 deletions(-) rename crates/fayalite/src/{build => }/vendor.rs (100%) rename crates/fayalite/src/{build => }/vendor/xilinx.rs (100%) rename crates/fayalite/src/{build => }/vendor/xilinx/yosys_nextpnr_prjxray.rs (99%) diff --git a/crates/fayalite/src/annotations.rs b/crates/fayalite/src/annotations.rs index 468ac77..4ca84dd 100644 --- a/crates/fayalite/src/annotations.rs +++ b/crates/fayalite/src/annotations.rs @@ -220,7 +220,7 @@ make_annotation_enum! { BlackBoxPath(BlackBoxPathAnnotation), DocString(DocStringAnnotation), CustomFirrtl(CustomFirrtlAnnotation), - Xilinx(crate::build::vendor::xilinx::XilinxAnnotation), + Xilinx(crate::vendor::xilinx::XilinxAnnotation), } } diff --git a/crates/fayalite/src/build.rs b/crates/fayalite/src/build.rs index 354d3b2..ccf81d1 100644 --- a/crates/fayalite/src/build.rs +++ b/crates/fayalite/src/build.rs @@ -7,6 +7,7 @@ use crate::{ intern::{Intern, InternSlice, Interned}, module::Module, util::{job_server::AcquiredJob, os_str_strip_prefix}, + vendor, }; use clap::ArgAction; use serde::{ @@ -33,7 +34,6 @@ pub mod firrtl; pub mod formal; pub mod graph; pub mod registry; -pub mod vendor; pub mod verilog; pub(crate) fn built_in_job_kinds() -> impl IntoIterator { diff --git a/crates/fayalite/src/firrtl.rs b/crates/fayalite/src/firrtl.rs index 0f2f017..fa3bb36 100644 --- a/crates/fayalite/src/firrtl.rs +++ b/crates/fayalite/src/firrtl.rs @@ -7,7 +7,7 @@ use crate::{ DocStringAnnotation, DontTouchAnnotation, SVAttributeAnnotation, TargetedAnnotation, }, array::Array, - build::{ToArgs, WriteArgs, vendor::xilinx::XilinxAnnotation}, + build::{ToArgs, WriteArgs}, bundle::{Bundle, BundleField, BundleType}, clock::Clock, enum_::{Enum, EnumType, EnumVariant}, @@ -39,6 +39,7 @@ use crate::{ BitSliceWriteWithBase, DebugAsRawString, GenericConstBool, HashMap, HashSet, const_str_array_is_strictly_ascending, }, + vendor::xilinx::XilinxAnnotation, }; use bitvec::slice::BitSlice; use clap::value_parser; diff --git a/crates/fayalite/src/lib.rs b/crates/fayalite/src/lib.rs index 67f2fe5..326d44b 100644 --- a/crates/fayalite/src/lib.rs +++ b/crates/fayalite/src/lib.rs @@ -108,4 +108,5 @@ pub mod source_location; pub mod testing; pub mod ty; pub mod util; +pub mod vendor; pub mod wire; diff --git a/crates/fayalite/src/module/transform/deduce_resets.rs b/crates/fayalite/src/module/transform/deduce_resets.rs index d740c3c..e84d835 100644 --- a/crates/fayalite/src/module/transform/deduce_resets.rs +++ b/crates/fayalite/src/module/transform/deduce_resets.rs @@ -1802,7 +1802,7 @@ impl_run_pass_clone!([] ExternModuleParameter); impl_run_pass_clone!([] SIntValue); impl_run_pass_clone!([] std::ops::Range); impl_run_pass_clone!([] UIntValue); -impl_run_pass_clone!([] crate::build::vendor::xilinx::XilinxAnnotation); +impl_run_pass_clone!([] crate::vendor::xilinx::XilinxAnnotation); impl_run_pass_copy!([] BlackBoxInlineAnnotation); impl_run_pass_copy!([] BlackBoxPathAnnotation); impl_run_pass_copy!([] bool); diff --git a/crates/fayalite/src/module/transform/visit.rs b/crates/fayalite/src/module/transform/visit.rs index 35d2429..0aac2e0 100644 --- a/crates/fayalite/src/module/transform/visit.rs +++ b/crates/fayalite/src/module/transform/visit.rs @@ -7,7 +7,6 @@ use crate::{ DocStringAnnotation, DontTouchAnnotation, SVAttributeAnnotation, TargetedAnnotation, }, array::ArrayType, - build::vendor::xilinx::{XdcIOStandardAnnotation, XdcLocationAnnotation, XilinxAnnotation}, bundle::{Bundle, BundleField, BundleType}, clock::Clock, enum_::{Enum, EnumType, EnumVariant}, @@ -34,6 +33,7 @@ use crate::{ sim::{ExternModuleSimulation, value::DynSimOnly}, source_location::SourceLocation, ty::{CanonicalType, Type}, + vendor::xilinx::{XdcIOStandardAnnotation, XdcLocationAnnotation, XilinxAnnotation}, wire::Wire, }; use num_bigint::{BigInt, BigUint}; diff --git a/crates/fayalite/src/build/vendor.rs b/crates/fayalite/src/vendor.rs similarity index 100% rename from crates/fayalite/src/build/vendor.rs rename to crates/fayalite/src/vendor.rs diff --git a/crates/fayalite/src/build/vendor/xilinx.rs b/crates/fayalite/src/vendor/xilinx.rs similarity index 100% rename from crates/fayalite/src/build/vendor/xilinx.rs rename to crates/fayalite/src/vendor/xilinx.rs diff --git a/crates/fayalite/src/build/vendor/xilinx/yosys_nextpnr_prjxray.rs b/crates/fayalite/src/vendor/xilinx/yosys_nextpnr_prjxray.rs similarity index 99% rename from crates/fayalite/src/build/vendor/xilinx/yosys_nextpnr_prjxray.rs rename to crates/fayalite/src/vendor/xilinx/yosys_nextpnr_prjxray.rs index c489111..c3b1245 100644 --- a/crates/fayalite/src/build/vendor/xilinx/yosys_nextpnr_prjxray.rs +++ b/crates/fayalite/src/vendor/xilinx/yosys_nextpnr_prjxray.rs @@ -10,7 +10,6 @@ use crate::{ external::{ ExternalCommand, ExternalCommandJob, ExternalCommandJobKind, ExternalProgramTrait, }, - vendor::xilinx::{XdcIOStandardAnnotation, XdcLocationAnnotation, XilinxAnnotation}, verilog::{UnadjustedVerilog, VerilogDialect, VerilogJob, VerilogJobKind}, }, bundle::Bundle, @@ -19,6 +18,7 @@ use crate::{ module::{Module, NameId}, prelude::JobParams, util::job_server::AcquiredJob, + vendor::xilinx::{XdcIOStandardAnnotation, XdcLocationAnnotation, XilinxAnnotation}, }; use clap::ValueEnum; use eyre::Context;