minor fixes

vaivaswatha · Jan 15, 2024 · 153f5c2 · 153f5c2
1 parent 4a6ff4b
commit 153f5c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/derive/src/derive_attr.rs b/derive/src/derive_attr.rs
@@ -185,7 +185,7 @@ fn impl_attribute(def_attrib: &DefAttribute) -> TokenStream {
                     }
                 }
 
-                fn verify_interfaces(&self, ctx: &Context) -> ::pliron::error::Result<()> {
+                fn verify_interfaces(&self, ctx: &::pliron::context::Context) -> ::pliron::error::Result<()> {
                     let interface_verifiers = ::inventory::iter::<#verifiers_name>();
                     for verifier in interface_verifiers {
                         (verifier.0)(self, ctx)?;
@@ -258,7 +258,7 @@ mod tests {
                     }
                 }
 
-                fn verify_interfaces(&self, ctx: &Context) -> ::pliron::error::Result<()> {
+                fn verify_interfaces(&self, ctx: &::pliron::context::Context) -> ::pliron::error::Result<()> {
                     let interface_verifiers = ::inventory::iter::<AttrInterfaceVerifier_UnitAttr>();
                     for verifier in interface_verifiers {
                         (verifier.0)(self, ctx)?;

diff --git a/derive/src/derive_type.rs b/derive/src/derive_type.rs
@@ -67,7 +67,9 @@ impl Attrs {
         let mut attributes = vec![];
 
         for attr in input {
-            if attr.path().is_ident(DialectName::ATTR_NAME) {
+            if attr.path().is_ident("def_type") {
+                continue;
+            } else if attr.path().is_ident(DialectName::ATTR_NAME) {
                 require_once(DialectName::ATTR_NAME, &dialect, attr)?;
                 dialect = Some(DialectName::from_syn(attr)?);
             } else if attr.path().is_ident(TypeName::ATTR_NAME) {
@@ -216,7 +218,6 @@ mod tests {
 
         let want = quote! {
             #[derive(::pliron_derive::DeriveAttribDummy)]
-            #[def_type]
             #[derive(Hash, PartialEq, Eq, Debug)]
             #[ir_kind = "type"]
             pub struct SimpleType {}