feat: support bevy v0.18.0-rc.1

Author: DaAlbrecht

Cargo.lock

@@ -54,7 +54,7 @@ toml = { version = "0.9.8", default-features = false, features = [
 
 [dev-dependencies]
 # Used when running UI tests.
-bevy = { version = "0.17.2", default-features = false, features = [
+bevy = { version = "0.18.0-rc.1", default-features = false, features = [
     "std",
     # used for the `camera_modification_in_fixed_update` lint
     "bevy_render",

bevy_lint/Cargo.toml

@@ -119,8 +119,7 @@ fn check_insert_resource(cx: &LateContext<'_>, method_call: &MethodCall) {
     let ty = cx.typeck_results().expr_ty_adjusted(arg);
 
     // If `arg` is `Messages<T>`, emit the lint.
-    // `Events<T>` got deprecated for `Messages<T>` in `0.17`.
-    if crate::paths::EVENTS.matches_ty(cx, ty) || crate::paths::MESSAGES.matches_ty(cx, ty) {
+    if crate::paths::MESSAGES.matches_ty(cx, ty) {
         let mut applicability = Applicability::MachineApplicable;
 
         let message_ty_snippet = extract_ty_message_snippet(ty, &mut applicability);
@@ -198,10 +197,7 @@ fn check_init_resource<'tcx>(cx: &LateContext<'tcx>, method_call: &MethodCall<'t
         let resource_ty = ty_from_hir_ty(cx, resource_hir_ty.as_unambig_ty());
 
         // If the resource type is `Messages<T>`, emit the lint.
-        // `Events<T>` got deprecated for `Messages<T>` in `0.17`.
-        if crate::paths::EVENTS.matches_ty(cx, resource_ty)
-            || crate::paths::MESSAGES.matches_ty(cx, resource_ty)
-        {
+        if crate::paths::MESSAGES.matches_ty(cx, resource_ty) {
             let mut applicability = Applicability::MachineApplicable;
 
             let message_ty_snippet = extract_hir_message_snippet(

bevy_lint/src/lints/suspicious/insert_message_resource.rs

@@ -82,10 +82,7 @@ impl<'tcx> LateLintPass<'tcx> for IterCurrentUpdateMessages {
                 .expr_ty_adjusted(method_call.receiver)
                 .peel_refs();
 
-            // Events is deprecated in favor of `Messages` in bevy `0.17`
-            if !(crate::paths::EVENTS.matches_ty(cx, src_ty)
-                || crate::paths::MESSAGES.matches_ty(cx, src_ty))
-            {
+            if !(crate::paths::MESSAGES.matches_ty(cx, src_ty)) {
                 return;
             }
 

bevy_lint/src/lints/suspicious/iter_current_update_messages.rs

@@ -21,68 +21,66 @@ macro_rules! type_path {
 
 // Keep the following list alphabetically sorted :)
 
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_app/src/app.rs#L80>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_app/src/app.rs#L84>
 pub static APP: PathLookup = type_path!(bevy_app::app::App);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/bundle/mod.rs#L200>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/bundle/mod.rs#L200>
 pub static BUNDLE: PathLookup = type_path!(bevy_ecs::bundle::Bundle);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_camera/src/camera.rs#L343>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_camera/src/camera.rs#L349>
 pub static CAMERA: PathLookup = type_path!(bevy_camera::camera::Camera);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/system/commands/mod.rs#L102>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/system/commands/mod.rs#L105>
 pub static COMMANDS: PathLookup = type_path!(bevy_ecs::system::commands::Commands);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/component/mod.rs#L487>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/component/mod.rs#L509>
 pub static COMPONENT: PathLookup = type_path!(bevy_ecs::component::Component);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/world/deferred_world.rs#L28>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/world/deferred_world.rs#L28>
 pub static DEFERRED_WORLD: PathLookup = type_path!(bevy_ecs::world::deferred_world::DeferredWorld);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/system/system_param.rs#L1253>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/system/system_param.rs#L1301>
 pub static DEFERRED: PathLookup = type_path!(bevy_ecs::system::system_param::Deferred);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/system/commands/mod.rs#L1259>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/system/commands/mod.rs#L1282>
 pub static ENTITY_COMMANDS: PathLookup = type_path!(bevy_ecs::system::EntityCommands);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/world/entity_ref.rs#L450>
-pub static ENTITY_MUT: PathLookup = type_path!(bevy_ecs::world::entity_ref::EntityMut);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/event/mod.rs#L88>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/world/entity_access/entity_mut.rs#L42>
+pub static ENTITY_MUT: PathLookup = type_path!(bevy_ecs::world::entity_access::EntityMut);
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/event/mod.rs#L88>
 pub static EVENT: PathLookup = type_path!(bevy_ecs::event::Event);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/event/mod.rs#L358>
-pub static EVENTS: PathLookup = type_path!(bevy_ecs::event::Events);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/world/entity_ref.rs#L3516>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/world/entity_access/filtered.rs#L358>
 pub static FILTERED_ENTITY_MUT: PathLookup =
-    type_path!(bevy_ecs::world::entity_ref::FilteredEntityMut);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_app/src/main_schedule.rs#L132>
+    type_path!(bevy_ecs::world::entity_access::FilteredEntityMut);
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_app/src/main_schedule.rs#L133>
 pub static FIXED_UPDATE: PathLookup = type_path!(bevy_app::main_schedule::FixedUpdate);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/message/mod.rs#L96>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/message/mod.rs#L96>
 pub static MESSAGE: PathLookup = type_path!(bevy_ecs::message::Message);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/message/messages.rs#L95>
+/// <https://githu.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/message/messages.rs#L95>
 pub static MESSAGES: PathLookup = type_path!(bevy_ecs::message::Messages);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/change_detection.rs#L1035>
-pub static MUT_UNTYPED: PathLookup = type_path!(bevy_ecs::change_detection::MutUntyped);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/change_detection.rs#L935>
-pub static MUT: PathLookup = type_path!(bevy_ecs::change_detection::Mut);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/change_detection.rs#L773>
-pub static NON_SEND_MUT: PathLookup = type_path!(bevy_ecs::change_detection::NonSendMut);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_reflect/src/reflect.rs#L99>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/change_detection/params.rs#L513>
+pub static MUT_UNTYPED: PathLookup = type_path!(bevy_ecs::change_detection::params::MutUntyped);
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/change_detection/params.rs#L415>
+pub static MUT: PathLookup = type_path!(bevy_ecs::change_detection::params::Mut);
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/change_detection/params.rs#L257>
+pub static NON_SEND_MUT: PathLookup = type_path!(bevy_ecs::change_detection::params::NonSendMut);
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_reflect/src/reflect.rs#L99>
 pub static PARTIAL_REFLECT: PathLookup = type_path!(bevy_reflect::reflect::PartialReflect);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_app/src/plugin.rs#L57>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_app/src/plugin.rs#L57>
 pub static PLUGIN: PathLookup = type_path!(bevy_app::plugin::Plugin);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ptr/src/lib.rs#L303>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ptr/src/lib.rs#L307>
 pub static PTR_MUT: PathLookup = type_path!(bevy_ptr::PtrMut);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/system/query.rs#L485>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/system/query.rs#L485>
 pub static QUERY: PathLookup = type_path!(bevy_ecs::system::query::Query);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_reflect/src/reflect.rs#L415>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_reflect/src/reflect.rs#L415>
 pub static REFLECT: PathLookup = type_path!(bevy_reflect::reflect::Reflect);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/relationship/related_methods.rs#L565>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/relationship/related_methods.rs#L565>
 pub static RELATED_SPAWNER: PathLookup =
     type_path!(bevy_ecs::relationship::related_methods::RelatedSpawner);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/relationship/related_methods.rs#L611>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/relationship/related_methods.rs#L611>
 pub static RELATED_SPAWNER_COMMANDS: PathLookup =
     type_path!(bevy_ecs::relationship::related_methods::RelatedSpawnerCommands);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/change_detection.rs#L714>
-pub static RES_MUT: PathLookup = type_path!(bevy_ecs::change_detection::ResMut);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/resource.rs#L75>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/change_detection/params.rs#L172>
+pub static RES_MUT: PathLookup = type_path!(bevy_ecs::change_detection::params::ResMut);
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/resource.rs#L75>
 pub static RESOURCE: PathLookup = type_path!(bevy_ecs::resource::Resource);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/schedule/set.rs#L154>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/schedule/set.rs#L154>
 pub static SYSTEM_SET: PathLookup = type_path!(bevy_ecs::schedule::set::SystemSet);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_app/src/main_schedule.rs#L172>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_app/src/main_schedule.rs#L173>
 pub static UPDATE: PathLookup = type_path!(bevy_app::main_schedule::Update);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/query/filter.rs#L141>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/query/filter.rs#L142>
 pub static WITH: PathLookup = type_path!(bevy_ecs::query::filter::With);
-/// <https://github.com/bevyengine/bevy/blob/v0.17.2/crates/bevy_ecs/src/world/mod.rs#L90>
+/// <https://github.com/bevyengine/bevy/blob/v0.18.0-rc.1/crates/bevy_ecs/src/world/mod.rs#L92>
 pub static WORLD: PathLookup = type_path!(bevy_ecs::world::World);

bevy_lint/src/paths.rs

@@ -158,12 +158,14 @@ declare_bevy_symbols! {
     commands,
     component,
     deferred_world,
+    entity_access,
     entity_ref,
     event,
     init_resource,
     insert_resource,
     iter_current_update_messages,
     main_schedule,
+    params,
     query,
     related_methods,
     relationship,