bump codegen & codegen new files

makspll · makspll · commit 07ebdab1099e · 2024-11-06T22:41:42.000Z
diff --git a/.github/workflows/bevy_api_gen.yml b/.github/workflows/bevy_api_gen.yml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2024-05-20
+          toolchain: nightly-2024-11-05
           override: true
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2.7.3
@@ -54,7 +54,7 @@ jobs:
         with:
           profile: minimal
           components: rustfmt
-          toolchain: nightly-2024-05-20
+          toolchain: nightly-2024-11-05
           override: true
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2.7.3
@@ -77,7 +77,7 @@ jobs:
           rm -rf crates
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2024-05-20
+          toolchain: nightly-2024-11-05
           components: clippy
           override: true
       - name: Rust Cache
@@ -100,7 +100,7 @@ jobs:
           rm -rf crates
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2024-05-20
+          toolchain: nightly-2024-11-05
           override: true
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2.7.3
@@ -122,7 +122,7 @@ jobs:
           rm -rf crates
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2024-05-20
+          toolchain: nightly-2024-11-05
           override: true
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2.7.3
diff --git a/.github/workflows/release-plz.yml b/.github/workflows/release-plz.yml
@@ -50,7 +50,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2024-05-20
+          toolchain: nightly-2024-11-05
           override: true
           working-directory: crates/bevy_api_gen
       - name: Install Rust toolchain
diff --git a/check.sh b/check.sh
@@ -4,7 +4,7 @@ CURRENT_DIR=$(basename "$PWD")
 
 
 if [[ "$CURRENT_DIR" == "bevy_api_gen" ]]; then
-    cargo +nightly-2024-05-20 clippy --all-targets --message-format=json 
+    cargo +nightly-2024-11-05 clippy --all-targets --message-format=json 
 else
     cargo clippy --workspace --all-targets --message-format=json --features="lua54 lua_script_api rhai rhai_script_api teal rune bevy/file_watcher bevy/multi_threaded"
 fi
diff --git a/crates/bevy_api_gen/Cargo.toml b/crates/bevy_api_gen/Cargo.toml
@@ -37,17 +37,16 @@ source = "discover"
 rustc_private = true
 
 [rust-analyzer.check]
-overrideCommand = ["cargo", "+nightly-2024-05-20", "a", "--message-format=json"]
+overrideCommand = ["cargo", "+nightly-2024-11-05", "a", "--message-format=json"]
 
 
 [dependencies]
 log = "0.4"
 env_logger = "0.11"
-rustc_plugin = "=0.10.0-nightly-2024-05-20"
+rustc_plugin = { path = "../../../rustc_plugin/crates/rustc_plugin" }
 indexmap = "2"
 tempdir = "0.3"
 cargo_metadata = "0.18"
-rustc_data_structures = "0.0.1"
 serde_json = "1"
 serde = "1"
 clap = { version = "4", features = ["derive", "string"] }
diff --git a/crates/bevy_api_gen/readme.md b/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-05-20 install bevy_api_gen
+cargo +nightly-2024-11-05 install bevy_api_gen
 ```
 
 # Usage
@@ -18,39 +18,39 @@ cargo +nightly-2024-05-20 install bevy_api_gen
 To run the main codegen process, use the following command:
 
 ```bash
-cargo +nightly-2024-05-20 bevy-api-gen generate
+cargo +nightly-2024-11-05 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-05-20/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-11-05/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-05-20 bevy-api-gen collect
+cargo +nightly-2024-11-05 bevy-api-gen collect
 ```
 
 ## List Types
 
 To see a list of all `Reflect` implementing types in your workspace run:
 
 ```bash
-cargo +nightly-2024-05-20 bevy-api-gen list-types > all_types.txt
+cargo +nightly-2024-11-05 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-05-20 bevy-api-gen list-templates
+cargo +nightly-2024-11-05 bevy-api-gen list-templates
 ```
 
 ## Print Template
 
 You can also print any of the templates to stdout:
 
 ```bash
-cargo +nightly-2024-05-20 bevy-api-gen print item.tera
+cargo +nightly-2024-11-05 bevy-api-gen print item.tera
 ```
diff --git a/crates/bevy_api_gen/rust-toolchain.toml b/crates/bevy_api_gen/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
 components = ["clippy", "rust-src", "rustc-dev", "llvm-tools"]
-channel = "nightly-2024-05-20"
+channel = "nightly-2024-11-05"
diff --git a/crates/bevy_api_gen/src/bin/driver.rs b/crates/bevy_api_gen/src/bin/driver.rs
@@ -1,3 +1,4 @@
+#![feature(rustc_private)]
 use bevy_api_gen::*;
 
 fn main() {
diff --git a/crates/bevy_api_gen/src/bin/main.rs b/crates/bevy_api_gen/src/bin/main.rs
@@ -1,3 +1,4 @@
+#![feature(rustc_private)]
 use std::{
     collections::HashMap,
     env,
diff --git a/crates/bevy_api_gen/src/lib.rs b/crates/bevy_api_gen/src/lib.rs
@@ -1,15 +1,13 @@
 #![feature(rustc_private, let_chains)]
 #![deny(rustc::internal)]
+
 extern crate rustc_ast;
 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;
 
diff --git a/crates/bevy_api_gen/src/modifying_file_loader.rs b/crates/bevy_api_gen/src/modifying_file_loader.rs
@@ -1,7 +1,11 @@
-use std::io;
+use std::{
+    io,
+    sync::atomic::{AtomicBool, Ordering},
+};
 
 use log::trace;
-use rustc_data_structures::sync::{AtomicBool, Lrc, Ordering};
+use rustc_middle::ty::data_structures::Lrc;
+// use rustc_data_structures::sync::{AtomicBool, Lrc};
 use rustc_span::source_map::{FileLoader, RealFileLoader};
 
 /// Injects extern statements into the first loaded file (crate root)
diff --git a/crates/bevy_api_gen/src/passes/cache_traits.rs b/crates/bevy_api_gen/src/passes/cache_traits.rs
@@ -66,11 +66,12 @@ pub(crate) fn cache_traits(ctxt: &mut BevyCtxt<'_>, _args: &Args) -> bool {
                 .join(", ")
         );
 
-        panic!(
-            "Could not find traits: [{}] in crate: {}, did bootstrapping go wrong?",
-            ctxt.cached_traits.missing_std_source_traits().join(", "),
-            tcx.crate_name(LOCAL_CRATE)
-        )
+        // TODO: figure out why some crates are missing std::fmt::Display etc
+        // panic!(
+        //     "Could not find traits: [{}] in crate: {}, did bootstrapping go wrong?",
+        //     ctxt.cached_traits.missing_std_source_traits().join(", "),
+        //     tcx.crate_name(LOCAL_CRATE)
+        // )
     }
 
     true
diff --git a/crates/bevy_api_gen/src/passes/find_methods_and_fields.rs b/crates/bevy_api_gen/src/passes/find_methods_and_fields.rs
@@ -6,7 +6,9 @@ use rustc_hir::{
     Safety,
 };
 use rustc_infer::infer::TyCtxtInferExt;
-use rustc_middle::ty::{AdtKind, AssocKind, FieldDef, FnSig, ParamEnv, Ty, TyCtxt, TyKind};
+use rustc_middle::ty::{
+    AdtKind, AssocKind, FieldDef, FnSig, ParamEnv, Ty, TyCtxt, TyKind, TypingMode,
+};
 use rustc_span::Symbol;
 use rustc_trait_selection::infer::InferCtxtExt;
 
@@ -86,7 +88,6 @@ pub(crate) fn find_methods_and_fields(ctxt: &mut BevyCtxt<'_>, _args: &Args) ->
         let mut all_impls = ctxt
             .tcx
             .inherent_impls(def_id)
-            .unwrap()
             .iter()
             .chain(trait_impls_for_ty.iter().flatten())
             .collect::<Vec<_>>();
@@ -410,7 +411,7 @@ pub(crate) fn impls_trait<'tcx>(
     trait_did: DefId,
 ) -> bool {
     tcx.infer_ctxt()
-        .build()
+        .build(TypingMode::non_body_analysis())
         .type_implements_trait(trait_did, [ty], param_env)
         .must_apply_modulo_regions()
 }
diff --git a/crates/bevy_api_gen/src/passes/find_trait_impls.rs b/crates/bevy_api_gen/src/passes/find_trait_impls.rs
@@ -6,7 +6,7 @@ use rustc_infer::{
     infer::{InferCtxt, TyCtxtInferExt},
     traits::{Obligation, ObligationCause},
 };
-use rustc_middle::ty::Ty;
+use rustc_middle::ty::{Ty, TypingMode};
 use rustc_span::DUMMY_SP;
 use rustc_trait_selection::traits::ObligationCtxt;
 
@@ -105,7 +105,7 @@ fn type_impl_of_trait(
             //TODO: false negatives coming from this inference
 
             let ty = tcx.type_of(reflect_ty_did).instantiate_identity();
-            let infcx = tcx.infer_ctxt().build();
+            let infcx = tcx.infer_ctxt().build(TypingMode::non_body_analysis());
             let result = impl_matches(&infcx, ty, impl_did);
             log::trace!("Result: {:#?}", result);
             if result {
diff --git a/makefile b/makefile
@@ -21,7 +21,7 @@ PACKAGE=bevy_mod_scripting
 TEST_NAME=
 # # valgrind outputs a callgrind.out.<pid>. We can analyze this with kcachegrind
 # kcachegrind
-NIGHTLY_VERSION=nightly-2024-05-20
+NIGHTLY_VERSION=nightly-2024-11-05
 BEVY_VERSION=0.15.0-rc.2
 GLAM_VERSION=0.29.0
 CODEGEN_PATH=${PWD}/target/codegen
@@ -61,10 +61,10 @@ clean_bevy:
 	cd ${BEVY_PATH} && cargo clean
 
 generate_bevy:
-	cd ${BEVY_PATH} && cargo +${NIGHTLY_VERSION} bevy-api-gen generate --output ${OUTPUT_PATH} --template-args '{ "self_is_bevy_script_api": true}' --features ${GEN_BEVY_FEATURES} 
+	cd ${BEVY_PATH} && cargo +${NIGHTLY_VERSION} bevy-api-gen generate --output ${OUTPUT_PATH} --template-args '{ "self_is_bevy_script_api": true}' --features ${GEN_BEVY_FEATURES} -vv
 
 collect_bevy:
-	cd ${BEVY_PATH} && cargo +${NIGHTLY_VERSION} bevy-api-gen collect --output ${OUTPUT_PATH} --template-args '{ "self_is_bevy_script_api": true}'
+	cd ${BEVY_PATH} && cargo +${NIGHTLY_VERSION} bevy-api-gen collect --output ${OUTPUT_PATH} --template-args '{ "self_is_bevy_script_api": true}' -vv
 
 deletion_confirmation:
 	@echo -n "This action will delete ALL files in directories: '${GENERATED_SRC_PATH}' amd ${OUTPUT_PATH} (y/N) "

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#![feature(rustc_private)]`
`1`	`2`	`use bevy_api_gen::*;`
`2`	`3`
`3`	`4`	`fn main() {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#![feature(rustc_private)]`
`1`	`2`	`use std::{`
`2`	`3`	`collections::HashMap,`
`3`	`4`	`env,`