bring over bevy api gen work

Author: makspll

crates/bevy_api_gen/Cargo.bootstrap.toml

@@ -6,7 +6,7 @@ edition = "2021"
 
 [dependencies]
 mlua = { version = "0.9.2", features = ["lua54", "vendored", "send", "macros"] }
-bevy_reflect = { version = "0.14", features = [
+bevy_reflect = { version = "0.15.0-rc.3", features = [
     "bevy",
     "glam",
     "petgraph",

crates/bevy_api_gen/Cargo.toml

@@ -36,15 +36,12 @@ source = "discover"
 [package.metadata.rust-analyzer]
 rustc_private = true
 
-[rust-analyzer.check]
-overrideCommand = ["cargo", "+nightly-2024-11-05", "a", "--message-format=json"]
-
 
 [dependencies]
-log = "0.4"
-env_logger = "0.11"
 rustc_plugin = { git = "https://github.com/makspll/rustc_plugin", branch = "feature/rust-1.82.0" }
 indexmap = "2"
+log = "0.4"
+env_logger = "0.11"
 tempdir = "0.3"
 cargo_metadata = "0.18"
 serde_json = "1"

crates/bevy_api_gen/readme.md

@@ -8,7 +8,7 @@ bevy_api_gen is a Cargo plugin that generates reflection-powered wrappers for Be
 To install bevy_api_gen, use the following command:
 
 ```bash
-cargo +nightly-2024-11-05 install bevy_api_gen
+cargo +nightly-2024-01-24 install bevy_api_gen
 ```
 
 # Usage
@@ -18,39 +18,39 @@ cargo +nightly-2024-11-05 install bevy_api_gen
 To run the main codegen process, use the following command:
 
 ```bash
-cargo +nightly-2024-11-05 bevy-api-gen generate
+cargo +nightly-2024-01-24 bevy-api-gen generate
 ```
 
-This will perform all parts of the process and generate meta as well as .rs files for each crate in your workspace in your `/target/plugin-nightly-2024-11-05/bevy_api_gen` directory
+This will perform all parts of the process and generate meta as well as .rs files for each crate in your workspace in your `/target/plugin-nightly-2024-01-24/bevy_api_gen` directory
 
 ## Collect
 
 After generating all the files, you can 'collect' them in a mod.rs file like so:
 
 ```bash
-cargo +nightly-2024-11-05 bevy-api-gen collect
+cargo +nightly-2024-01-24 bevy-api-gen collect
 ```
 
 ## List Types
 
 To see a list of all `Reflect` implementing types in your workspace run:
 
 ```bash
-cargo +nightly-2024-11-05 bevy-api-gen list-types > all_types.txt
+cargo +nightly-2024-01-24 bevy-api-gen list-types > all_types.txt
 ```
 
 ## List Templates
 
 To see the list of all templates which you can override use:
 
 ```bash
-cargo +nightly-2024-11-05 bevy-api-gen list-templates
+cargo +nightly-2024-01-24 bevy-api-gen list-templates
 ```
 
 ## Print Template
 
 You can also print any of the templates to stdout:
 
 ```bash
-cargo +nightly-2024-11-05 bevy-api-gen print item.tera
+cargo +nightly-2024-01-24 bevy-api-gen print item.tera
 ```

crates/bevy_api_gen/src/args.rs

@@ -189,7 +189,12 @@ pub enum Command {
 
         /// The name of the API, this will be passed to the `collect.rs` template, which by default will be used as the APIProvider name and the
         /// title of the documentation.
-        #[arg(short, long, value_name = "NAME", default_value = "LuaBevyAPIProvider")]
+        #[arg(
+            short,
+            long,
+            value_name = "NAME",
+            default_value = "LuaBevyScriptingPlugin"
+        )]
         api_name: String,
     },
 }

crates/bevy_api_gen/src/bin/main.rs

@@ -1,4 +1,5 @@
 #![feature(rustc_private)]
+
 use std::{
     collections::HashMap,
     env,

crates/bevy_api_gen/src/callback.rs

@@ -87,6 +87,7 @@ impl rustc_driver::Callbacks for BevyAnalyzerCallbacks {
                 if !continue_ {
                     break;
                 }
+                trace!("Finished pass, continuing");
             }
         });
         rustc_driver::Compilation::Continue

crates/bevy_api_gen/src/context.rs

@@ -138,21 +138,21 @@ impl CachedTraits {
             .all(|t| self.std_source_traits.contains_key(*t))
     }
 
-    // pub(crate) fn missing_std_source_traits(&self) -> Vec<String> {
-    //     STD_SOURCE_TRAITS
-    //         .iter()
-    //         .filter(|t| !self.std_source_traits.contains_key(**t))
-    //         .map(|s| (*s).to_owned())
-    //         .collect()
-    // }
+    pub(crate) fn missing_std_source_traits(&self) -> Vec<String> {
+        STD_SOURCE_TRAITS
+            .iter()
+            .filter(|t| !self.std_source_traits.contains_key(**t))
+            .map(|s| (*s).to_owned())
+            .collect()
+    }
 }
 
 #[derive(Clone, Debug)]
 pub(crate) struct FunctionContext {
     pub(crate) def_id: DefId,
     pub(crate) has_self: bool,
     pub(crate) is_unsafe: bool,
-    pub(crate) trait_did: Option<DefId>,
+    pub(crate) trait_and_impl_did: Option<(DefId, DefId)>,
     /// strategies for input and output (last element is the output)
     pub(crate) reflection_strategies: Vec<ReflectionStrategy>,
 }

crates/bevy_api_gen/src/import_path.rs

@@ -27,7 +27,7 @@ impl std::fmt::Debug for ImportPathElement {
 /// Because we do not need ALL the items in the crate, we start searching from the item itself and traverse up the tree.
 /// Caches results for already found items.
 pub(crate) struct ImportPathFinder<'tcx> {
-    tcx: TyCtxt<'tcx>,
+    pub(crate) tcx: TyCtxt<'tcx>,
     pub(crate) cache: IndexMap<DefId, Vec<Vec<ImportPathElement>>>,
     pub(crate) include_private_paths: bool,
     pub(crate) import_path_processor: Option<Box<dyn Fn(&str) -> String>>,

crates/bevy_api_gen/src/lib.rs

@@ -1,13 +1,16 @@
 #![feature(rustc_private, let_chains)]
 #![deny(rustc::internal)]
-
 extern crate rustc_ast;
+extern crate rustc_const_eval;
 extern crate rustc_driver;
 extern crate rustc_errors;
 extern crate rustc_hir;
+extern crate rustc_hir_analysis;
 extern crate rustc_infer;
 extern crate rustc_interface;
+extern crate rustc_lint;
 extern crate rustc_middle;
+extern crate rustc_session;
 extern crate rustc_span;
 extern crate rustc_trait_selection;
 

crates/bevy_api_gen/src/meta.rs

@@ -66,6 +66,28 @@ impl MetaLoader {
         self.meta_for_retry(crate_name, 3)
     }
 
+    /// Searches the given meta sources in order for the provided DefPathHash, once a meta file containing this hash is found
+    /// the search stops and returns true, if no meta file is found containing the hash, false is returned
+    ///
+    /// if a curr_source argument is provided, the search will skip this source as it is assumed that the current crate is still being compiled and not meta file for it exists yet
+    pub fn one_of_meta_files_contains(
+        &self,
+        meta_sources: &[&str],
+        curr_source: Option<&str>,
+        target_def_path_hash: DefPathHash,
+    ) -> bool {
+        let meta = match meta_sources
+            .iter()
+            .filter(|s| curr_source.is_none() || curr_source.is_some_and(|cs| cs == **s))
+            .find_map(|s| self.meta_for(s))
+        {
+            Some(meta) => meta,
+            None => return false, // TODO: is it possible we get false negatives here ? perhaps due to parallel compilation ? or possibly because of dependency order
+        };
+
+        meta.contains_def_path_hash(target_def_path_hash)
+    }
+
     fn meta_for_retry(&self, crate_name: &str, _try_attempts: usize) -> Option<Meta> {
         let meta = self
             .meta_dirs
@@ -94,7 +116,7 @@ impl MetaLoader {
         let cache = self.cache.borrow();
         if cache.contains_key(crate_name) {
             trace!("Loading meta from cache for: {}", crate_name);
-            cache.get(crate_name).cloned()
+            return cache.get(crate_name).cloned();
         } else {
             trace!("Loading meta from filesystem for: {}", crate_name);
             drop(cache);