Changed QueryAttrs to be more iterator based. (#7889)

Author: orizi

crates/cairo-lang-defs/src/db.rs

@@ -846,30 +846,28 @@ fn collect_extra_allowed_attributes(
     plugin_diagnostics: &mut Vec<PluginDiagnostic>,
 ) -> OrderedHashSet<String> {
     let mut extra_allowed_attributes = OrderedHashSet::default();
-    for attr in item.attributes_elements(db) {
-        if attr.attr(db).as_syntax_node().get_text_without_trivia(db) == ALLOW_ATTR_ATTR {
-            let args = attr.clone().structurize(db).args;
-            if args.is_empty() {
-                plugin_diagnostics.push(PluginDiagnostic::error(
-                    attr.stable_ptr(db),
-                    "Expected arguments.".to_string(),
-                ));
-                continue;
-            }
-            for arg in args {
-                if let Some(ast::Expr::Path(path)) = try_extract_unnamed_arg(db, &arg.arg) {
-                    if let Some([ast::PathSegment::Simple(segment)]) =
-                        path.segments(db).elements(db).collect_array()
-                    {
-                        extra_allowed_attributes.insert(segment.ident(db).text(db).into());
-                        continue;
-                    }
+    for attr in item.query_attr(db, ALLOW_ATTR_ATTR) {
+        let args = attr.clone().structurize(db).args;
+        if args.is_empty() {
+            plugin_diagnostics.push(PluginDiagnostic::error(
+                attr.stable_ptr(db),
+                "Expected arguments.".to_string(),
+            ));
+            continue;
+        }
+        for arg in args {
+            if let Some(ast::Expr::Path(path)) = try_extract_unnamed_arg(db, &arg.arg) {
+                if let Some([ast::PathSegment::Simple(segment)]) =
+                    path.segments(db).elements(db).collect_array()
+                {
+                    extra_allowed_attributes.insert(segment.ident(db).text(db).into());
+                    continue;
                 }
-                plugin_diagnostics.push(PluginDiagnostic::error(
-                    arg.arg.stable_ptr(db),
-                    "Expected simple identifier.".to_string(),
-                ));
             }
+            plugin_diagnostics.push(PluginDiagnostic::error(
+                arg.arg.stable_ptr(db),
+                "Expected simple identifier.".to_string(),
+            ));
         }
     }
     extra_allowed_attributes

crates/cairo-lang-plugins/src/plugins/external_attributes_validation.rs

@@ -40,7 +40,7 @@ fn get_diagnostics<Item: QueryAttrs>(
     item: &Item,
 ) -> Option<Vec<PluginDiagnostic>> {
     let mut diagnostics: Vec<PluginDiagnostic> = Vec::new();
-    item.query_attr(db, DOC_ATTR).into_iter().for_each(|attr| {
+    item.query_attr(db, DOC_ATTR).for_each(|attr| {
         let args = attr.clone().structurize(db).args;
         if args.is_empty() {
             diagnostics.push(PluginDiagnostic::error(

crates/cairo-lang-plugins/src/plugins/panicable.rs

@@ -55,12 +55,12 @@ fn generate_panicable_code(
     visibility: ast::Visibility,
 ) -> PluginResult {
     let mut attrs = attributes.query_attr(db, PANIC_WITH_ATTR);
-    if attrs.is_empty() {
+    let Some(attr) = attrs.next() else {
+        // No `#[panic_with]` attribute found.
         return PluginResult::default();
-    }
+    };
     let mut diagnostics = vec![];
-    if attrs.len() > 1 {
-        let extra_attr = attrs.swap_remove(1);
+    if let Some(extra_attr) = attrs.next() {
         diagnostics.push(PluginDiagnostic::error(
             extra_attr.stable_ptr(db),
             "`#[panic_with]` cannot be applied multiple times to the same item.".into(),
@@ -79,7 +79,6 @@ fn generate_panicable_code(
         return PluginResult { code: None, diagnostics, remove_original_item: false };
     };
 
-    let attr = attrs.swap_remove(0);
     let mut builder = PatchBuilder::new(db, &attr);
     let attr = attr.structurize(db);
 

crates/cairo-lang-semantic/src/items/feature_kind.rs

@@ -13,6 +13,7 @@ use cairo_lang_syntax::node::helpers::QueryAttrs;
 use cairo_lang_syntax::node::{Terminal, TypedStablePtr, TypedSyntaxNode, ast};
 use cairo_lang_utils::ordered_hash_set::OrderedHashSet;
 use cairo_lang_utils::try_extract_matches;
+use itertools::Itertools;
 use smol_str::SmolStr;
 
 use crate::SemanticDiagnostic;
@@ -38,9 +39,9 @@ impl FeatureKind {
         diagnostics: &mut DiagnosticsBuilder<SemanticDiagnostic>,
         attrs: &ast::AttributeList,
     ) -> Self {
-        let unstable_attrs = attrs.query_attr(db, UNSTABLE_ATTR);
-        let deprecated_attrs = attrs.query_attr(db, DEPRECATED_ATTR);
-        let internal_attrs = attrs.query_attr(db, INTERNAL_ATTR);
+        let unstable_attrs = attrs.query_attr(db, UNSTABLE_ATTR).collect_vec();
+        let deprecated_attrs = attrs.query_attr(db, DEPRECATED_ATTR).collect_vec();
+        let internal_attrs = attrs.query_attr(db, INTERNAL_ATTR).collect_vec();
         if unstable_attrs.is_empty() && deprecated_attrs.is_empty() && internal_attrs.is_empty() {
             return Self::Stable;
         };

crates/cairo-lang-starknet/src/plugin/starknet_module/contract.rs

@@ -284,7 +284,7 @@ fn handle_contract_item(
             }
         }
         ast::ModuleItem::ImplAlias(alias_ast) => {
-            let abi_attrs = alias_ast.query_attr(db, ABI_ATTR);
+            let abi_attrs = alias_ast.query_attr(db, ABI_ATTR).collect_vec();
             if abi_attrs.is_empty() {
                 return;
             }

crates/cairo-lang-starknet/src/plugin/storage_interfaces.rs

@@ -13,7 +13,7 @@ use cairo_lang_syntax::node::db::SyntaxGroup;
 use cairo_lang_syntax::node::helpers::QueryAttrs;
 use cairo_lang_syntax::node::{TypedSyntaxNode, ast};
 use indoc::formatdoc;
-use itertools::zip_eq;
+use itertools::{Itertools, zip_eq};
 
 use super::starknet_module::backwards_compatible_storage;
 use super::utils::{has_derive, validate_v0};
@@ -67,7 +67,7 @@ impl MacroPlugin for StorageInterfacesPlugin {
         metadata: &MacroPluginMetadata<'_>,
     ) -> PluginResult {
         let mut diagnostics = vec![];
-        let storage_node_attrs = item_ast.query_attr(db, STORAGE_NODE_ATTR);
+        let storage_node_attrs = item_ast.query_attr(db, STORAGE_NODE_ATTR).collect_vec();
         if !matches!(item_ast, ast::ModuleItem::Struct(_)) && !storage_node_attrs.is_empty() {
             for attr in &storage_node_attrs {
                 diagnostics.push(PluginDiagnostic::error(
@@ -76,7 +76,7 @@ impl MacroPlugin for StorageInterfacesPlugin {
                 ));
             }
         }
-        let sub_pointers_attrs = item_ast.query_attr(db, STORAGE_SUB_POINTERS_ATTR);
+        let sub_pointers_attrs = item_ast.query_attr(db, STORAGE_SUB_POINTERS_ATTR).collect_vec();
         if !matches!(item_ast, ast::ModuleItem::Enum(_)) && !sub_pointers_attrs.is_empty() {
             for attr in &sub_pointers_attrs {
                 diagnostics.push(PluginDiagnostic::error(