From 39bdf3bdae1f1a905992a59e857bd46cd0590ce1 Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Sun, 2 Feb 2025 16:12:56 +0100 Subject: [PATCH] Adapt clippy run to include bin targets Since clippy run is limiting targets to --lib and --tests the tui is not being processed. Include also --bins but still limit targets since there are more things not generated by codegenerator. Change-Id: I9a0d83743cebbc6bfcdf2ffb1e5086055b392cdb --- codegenerator/rust_tui.py | 8 +++++--- playbooks/rust/all.yaml | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/codegenerator/rust_tui.py b/codegenerator/rust_tui.py index 5c732c4..049a356 100644 --- a/codegenerator/rust_tui.py +++ b/codegenerator/rust_tui.py @@ -674,9 +674,7 @@ class RustTuiGenerator(BaseGenerator): additional_imports.add( "openstack_sdk::{AsyncOpenStack, api::QueryAsync}" ) - additional_imports.add("structable_derive::StructTable") - additional_imports.add("crate::utils::StructTable") - additional_imports.add("crate::utils::OutputConfig") + if args.operation_type == "list": if "limit" in [ k for (k, _) in type_manager.get_parameters("query") @@ -685,6 +683,10 @@ class RustTuiGenerator(BaseGenerator): additional_imports.add( "openstack_sdk::api::{paged, Pagination}" ) + additional_imports.add("structable_derive::StructTable") + additional_imports.add("crate::utils::StructTable") + additional_imports.add("crate::utils::OutputConfig") + elif args.operation_type == "delete": additional_imports.add("openstack_sdk::api::ignore") additional_imports.add( diff --git a/playbooks/rust/all.yaml b/playbooks/rust/all.yaml index 3aa7637..139ce93 100644 --- a/playbooks/rust/all.yaml +++ b/playbooks/rust/all.yaml @@ -32,7 +32,7 @@ - name: "Optimize generated code with clippy" ansible.builtin.command: - cmd: "cargo clippy --fix --lib --tests --allow-dirty" + cmd: "cargo clippy --fix --lib --tests --bins --allow-dirty" chdir: "{{ rust_project_dir }}" - name: "Compile new code (only generated crates)"