rollback

powdr-labs · Jan 15, 2025 · 3984590 · 3984590
1 parent 5a7fb49
commit 3984590
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/ast/src/analyzed/mod.rs b/ast/src/analyzed/mod.rs
@@ -761,7 +761,7 @@ pub enum FunctionValueDefinition {
     Expression(TypedExpression),
     TypeDeclaration(TypeDeclaration),
     TypeConstructor(Arc<EnumDeclaration>, EnumVariant),
-    TraitDeclaration(Arc<TraitDeclaration>),
+    TraitDeclaration(TraitDeclaration),
     TraitFunction(Arc<TraitDeclaration>, NamedType),
 }
 
@@ -791,9 +791,7 @@ impl Children<Expression> for FunctionValueDefinition {
                 type_declaration.children_mut()
             }
             FunctionValueDefinition::TypeConstructor(_, variant) => variant.children_mut(),
-            FunctionValueDefinition::TraitDeclaration(trait_decl) => {
-                Arc::make_mut(trait_decl).children_mut()
-            }
+            FunctionValueDefinition::TraitDeclaration(trait_decl) => trait_decl.children_mut(),
             FunctionValueDefinition::TraitFunction(_, trait_func) => trait_func.children_mut(),
         }
     }

diff --git a/pil-analyzer/src/statement_processor.rs b/pil-analyzer/src/statement_processor.rs
@@ -672,14 +672,13 @@ where
                 ty: self.type_processor(&type_vars).process_type(f.ty),
             })
             .collect();
-
-        let trait_decl = Arc::new(TraitDeclaration {
+        let trait_decl = TraitDeclaration {
             name: self.driver.resolve_decl(&trait_decl.name),
             type_vars: trait_decl.type_vars,
             functions,
-        });
+        };
 
-        let trait_functions = trait_decl
+        let inner_items = trait_decl
             .functions
             .iter()
             .map(|function| {
@@ -689,18 +688,19 @@ where
                         .relative_to(&Default::default())
                         .to_string(),
                     FunctionValueDefinition::TraitFunction(
-                        Arc::clone(&trait_decl),
+                        Arc::new(trait_decl.clone()),
                         function.clone(),
                     ),
                 )
             })
             .collect();
-
-        let trait_functions = self.process_inner_definitions(source, trait_functions);
+        let trait_functions = self.process_inner_definitions(source, inner_items);
 
         iter::once(PILItem::Definition(
             symbol,
-            Some(FunctionValueDefinition::TraitDeclaration(trait_decl)),
+            Some(FunctionValueDefinition::TraitDeclaration(
+                trait_decl.clone(),
+            )),
         ))
         .chain(trait_functions)
         .collect()