An other try

crates/noirc_frontend/src/ast/expression.rs

@@ -4,6 +4,7 @@ use crate::token::{Attribute, Token};
 use crate::{Ident, Path, Pattern, Recoverable, Statement, TraitConstraint, UnresolvedType};
 use acvm::FieldElement;
 use iter_extended::vecmap;
+use noirc_abi::{AbiDistinctness, AbiVisibility};
 use noirc_errors::{Span, Spanned};
 
 #[derive(Debug, PartialEq, Eq, Clone)]
@@ -360,13 +361,13 @@ pub struct FunctionDefinition {
     pub is_unconstrained: bool,
 
     pub generics: UnresolvedGenerics,
-    pub parameters: Vec<(Pattern, UnresolvedType, noirc_abi::AbiVisibility)>,
+    pub parameters: Vec<(Pattern, UnresolvedType, AbiVisibility)>,
     pub body: BlockExpression,
     pub span: Span,
     pub where_clause: Vec<TraitConstraint>,
     pub return_type: FunctionReturnType,
-    pub return_visibility: noirc_abi::AbiVisibility,
-    pub return_distinctness: noirc_abi::AbiDistinctness,
+    pub return_visibility: AbiVisibility,
+    pub return_distinctness: AbiDistinctness,
 }
 
 #[derive(Debug, PartialEq, Eq, Clone)]
@@ -655,8 +656,8 @@ impl FunctionDefinition {
             span: name.span(),
             where_clause: where_clause.to_vec(),
             return_type: return_type.clone(),
-            return_visibility: noirc_abi::AbiVisibility::Private,
-            return_distinctness: noirc_abi::AbiDistinctness::DuplicationAllowed,
+            return_visibility: AbiVisibility::Private,
+            return_distinctness: AbiDistinctness::DuplicationAllowed,
         }
     }
 }