Update bevy to 0.12.1

MinerSebas · Feb 8, 2024 · 33ad89d · 33ad89d
1 parent 6bc7073
commit 33ad89d
Show file tree

Hide file tree

Showing 22 changed files with 374 additions and 1,966 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,7 @@ itertools = "0.12.1"
 
 [dev-dependencies]
 dylint_testing = "2.6.1"
-bevy = { version = "0.8.1", default-features = false }
+bevy = { version = "0.12.1", default-features = false }
 
 [package.metadata.rust-analyzer]
 rustc_private = true
@@ -33,14 +33,6 @@ path = "ui/app_lints/insert_resource_with_default.rs"
 name = "bundle_with_incomplete_transforms"
 path = "ui/bundle_lints/bundle_with_incomplete_transforms.rs"
 
-[[example]]
-name = "multiple_labels_on_type"
-path = "ui/label_lints/multiple_labels_on_type.rs"
-
-[[example]]
-name = "str_label"
-path = "ui/label_lints/str_label.rs"
-
 [[example]]
 name = "empty_query"
 path = "ui/system_lints/empty_query.rs"

diff --git a/src/app_lints.rs b/src/app_lints.rs
@@ -23,15 +23,17 @@ declare_lint! {
     /// **Example:**
     /// ```rust
     /// # use bevy::app::App;
-    /// #[derive(Default)]
+    /// # use bevy::ecs::system::Resource;
+    /// #[derive(Default, Resource)]
     /// struct MyResource;
     ///
     /// App::new().insert_resource(MyResource::default());
     /// ```
     /// Is better expressed with:
     /// ```rust
     /// # use bevy::app::App;
-    /// #[derive(Default)]
+    /// # use bevy::ecs::system::Resource;
+    /// #[derive(Default, Resource)]
     /// struct MyResource;
     ///
     /// App::new().init_resource::<MyResource>();

diff --git a/src/bevy_paths.rs b/src/bevy_paths.rs
@@ -7,12 +7,6 @@ pub const QUERY: &[&str; 4] = &["bevy_ecs", "system", "query", "Query"];
 pub const SYSTEM_PARAM: &[&str; 4] = &["bevy_ecs", "system", "system_param", "SystemParam"];
 pub const BUNDLE: &[&str; 3] = &["bevy_ecs", "bundle", "Bundle"];
 
-pub const APP_LABEL: &[&str; 3] = &["bevy_app", "app", "AppLabel"];
-pub const STAGE_LABEL: &[&str; 4] = &["bevy_ecs", "schedule", "label", "StageLabel"];
-pub const SYSTEM_LABEL: &[&str; 4] = &["bevy_ecs", "schedule", "label", "SystemLabel"];
-pub const RUN_CRITERIA_LABEL: &[&str; 4] = &["bevy_ecs", "schedule", "label", "RunCriteriaLabel"];
-pub const AMBIGUITY_SET_LABEL: &[&str; 4] = &["bevy_ecs", "schedule", "label", "AmbiguitySetLabel"];
-
 pub const TRANSFORM: &[&str; 4] = &["bevy_transform", "components", "transform", "Transform"];
 pub const GLOBAL_TRANSFORM: &[&str; 4] = &[
     "bevy_transform",

diff --git a/src/bundle_lints.rs b/src/bundle_lints.rs
@@ -75,7 +75,7 @@ impl<'tcx> LateLintPass<'tcx> for BundleLintPass {
         let mut contains_transform = false;
         let mut contains_global_transform = false;
 
-        for field in MixedTy::fields_from_struct_item(ctx, item).unwrap() {
+        for field in MixedTy::fields_from_struct_item(ctx, item).iter().flatten() {
             if match_type(ctx, field.middle, TRANSFORM) {
                 contains_transform = true;
             } else if match_type(ctx, field.middle, GLOBAL_TRANSFORM) {