Merge pull request #390 from godot-rust/qol/restructure-modules

Clean up file structure in `godot-macros` and `itest` crates

Author: Bromeon

.github/workflows/full-ci.yml

@@ -79,9 +79,15 @@ jobs:
       # Note: could use `-- --no-deps` to not lint dependencies, however it doesn't really speed up and also skips deps in workspace.
       - name: "Check clippy"
         run: |
-          cargo clippy --all-targets $GDEXT_FEATURES ${{ matrix.rust-extra-args }} -- \
-          -D clippy::suspicious -D clippy::style -D clippy::complexity -D clippy::perf \
-          -D clippy::dbg_macro -D clippy::todo -D clippy::unimplemented -D warnings 
+          cargo clippy --all-targets $GDEXT_FEATURES -- \
+          -D clippy::suspicious \
+          -D clippy::style \
+          -D clippy::complexity \
+          -D clippy::perf \
+          -D clippy::dbg_macro \
+          -D clippy::todo \
+          -D clippy::unimplemented \
+          -D warnings
 
   unit-test:
     name: unit-test (${{ matrix.name }}${{ matrix.rust-special }})

.github/workflows/minimal-ci.yml

@@ -83,9 +83,15 @@ jobs:
 
       - name: "Check clippy"
         run: |
-          cargo clippy --all-targets $GDEXT_FEATURES ${{ matrix.rust-extra-args }} -- \
-          -D clippy::suspicious -D clippy::style -D clippy::complexity -D clippy::perf \
-          -D clippy::dbg_macro -D clippy::todo -D clippy::unimplemented -D warnings
+          cargo clippy --all-targets $GDEXT_FEATURES -- \
+          -D clippy::suspicious \
+          -D clippy::style \
+          -D clippy::complexity \
+          -D clippy::perf \
+          -D clippy::dbg_macro \
+          -D clippy::todo \
+          -D clippy::unimplemented \
+          -D warnings
           
 
   unit-test:

check.sh

@@ -158,8 +158,8 @@ function cmd_dok() {
 # Argument parsing
 ################################################################################
 
-# By default, disable `codegen-full` to reduce compile times and prevent flip-flopping
-# between `itest` compilations and `check.sh` runs.
+# By default, disable `codegen-full` to reduce compile times and prevent flip-flopping between
+# `itest` compilations and `check.sh` runs. Note that this means some runs are different from CI.
 extraCargoArgs=("--no-default-features")
 cmds=()
 nextArgIsFilter=false

godot-macros/src/class/data_models/field.rs

@@ -0,0 +1,36 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+use crate::class::{FieldExport, FieldVar};
+use proc_macro2::{Ident, TokenStream};
+
+pub struct Field {
+    pub name: Ident,
+    pub ty: venial::TyExpr,
+    pub default: Option<TokenStream>,
+    pub var: Option<FieldVar>,
+    pub export: Option<FieldExport>,
+}
+
+impl Field {
+    pub fn new(field: &venial::NamedField) -> Self {
+        Self {
+            name: field.name.clone(),
+            ty: field.ty.clone(),
+            default: None,
+            var: None,
+            export: None,
+        }
+    }
+}
+
+pub struct Fields {
+    /// All fields except `base_field`.
+    pub all_fields: Vec<Field>,
+
+    /// The field annotated with `#[base]`.
+    pub base_field: Option<Field>,
+}

godot-macros/src/derive_godot_class/property/field_export.rs renamed to godot-macros/src/class/data_models/field_export.rs

@@ -4,14 +4,13 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
+use proc_macro2::{Ident, TokenStream};
+use quote::quote;
 use std::collections::HashSet;
 
+use crate::class::FieldHint;
 use crate::util::{KvParser, ListParser};
 use crate::ParseResult;
-use proc_macro2::{Ident, TokenStream};
-use quote::quote;
-
-use super::FieldHint;
 
 /// Store info from `#[export]` attribute.
 pub enum FieldExport {

godot-macros/src/derive_godot_class/property/field_var.rs renamed to godot-macros/src/class/data_models/field_var.rs

@@ -4,14 +4,15 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-use crate::derive_godot_class::{make_existence_check, Field, FieldHint};
-use crate::method_registration::make_method_registration;
-use crate::method_registration::FuncDefinition;
-use crate::util::KvParser;
-use crate::{util, ParseResult};
 use proc_macro2::{Ident, TokenStream};
 use quote::{format_ident, quote};
 
+use crate::class::{
+    make_existence_check, make_method_registration, Field, FieldHint, FuncDefinition,
+};
+use crate::util::KvParser;
+use crate::{util, ParseResult};
+
 /// Store info from `#[var]` attribute.
 #[derive(Default, Clone, Debug)]
 pub struct FieldVar {
@@ -144,7 +145,7 @@ impl GetSet {
 }
 
 #[derive(Clone, Debug)]
-pub(super) struct GetterSetterImpl {
+pub struct GetterSetterImpl {
     pub function_name: Ident,
     pub function_impl: TokenStream,
     pub export_token: TokenStream,