move vendor module to top level

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),
     }
 }
 

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<Item = DynJobKind> {

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;

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;

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<usize>);
 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);

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};

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;