improvements to codegen + xtask

Author: makspll

codegen/src/args.rs

@@ -27,6 +27,10 @@ use serde::{Deserialize, Serialize};
 ///
 /// 5.Generates code using Tera templates given the data gathered from the analysis
 pub struct Args {
+    /// the output and artifact directory
+    #[arg(global = true, short, long, default_value = compute_default_dir(), value_name = "DIR")]
+    pub output: Utf8PathBuf,
+
     #[command(subcommand)]
     pub cmd: Command,
 
@@ -198,10 +202,6 @@ pub enum Command {
     ListTemplates,
     /// Crawls current workspace/crate and generates wrappers for Reflect types using templates
     Generate {
-        /// the output and artifact directory
-        #[arg(short, long, default_value = compute_default_dir(), value_name = "DIR")]
-        output: Utf8PathBuf,
-
         /// The directory in which to look for templates, if unspecified will use built-in templates
         #[arg(short, long, value_name = "DIR")]
         templates: Option<Utf8PathBuf>,

codegen/src/bin/main.rs

@@ -50,7 +50,7 @@ fn main() {
         .collect::<Vec<_>>();
 
     info!("Computing active features");
-    let include_crates = if args.cmd.is_generate() {
+    let include_crates = if !args.cmd.is_collect() {
         let workspace = Workspace::from(&metadata);
         let mut graph = WorkspaceGraph::from(workspace);
         info!("Using workspace graph: \n{}", graph.to_dot());

codegen/src/callback.rs

@@ -37,8 +37,8 @@ impl rustc_driver::Callbacks for BevyAnalyzerCallbacks {
         let mut meta_dirs = Vec::default();
         let mut templates_dir = None;
         // add all relevant meta dirs to the context
+        meta_dirs.push(self.args.output.to_owned());
         if let crate::Command::Generate {
-            output,
             meta,
             meta_output,
             templates,
@@ -49,7 +49,6 @@ impl rustc_driver::Callbacks for BevyAnalyzerCallbacks {
             if let Some(meta_output) = meta_output {
                 meta_dirs.push(meta_output.to_owned())
             };
-            meta_dirs.push(output.to_owned());
             meta.iter()
                 .flatten()
                 .for_each(|m| meta_dirs.push(m.to_owned()));