Bump version, address lints

Author: james-j-obrien

Cargo.lock

@@ -8,7 +8,7 @@ keywords = ["bevy", "gamedev", "graphics"]
 license = "MIT OR Apache-2.0"
 name = "bevy_vector_shapes"
 repository = "https://github.com/james-j-obrien/bevy_vector_shapes"
-version = "0.10.0"
+version = "0.11.0"
 
 [dependencies]
 any_vec = "0.15.0"

Cargo.toml

@@ -62,6 +62,7 @@ fn draw(mut painter: ShapePainter) {
 
 | bevy | bevy_vector_shapes |
 | ---- | ------------------ |
+| 0.17 | 0.11.0             |
 | 0.16 | 0.10.0             |
 | 0.15 | 0.9.3              |
 | 0.14 | 0.8.2              |

README.md

@@ -185,6 +185,9 @@ pub struct CanvasBundle {
 
 impl CanvasBundle {
     /// Create a [`CanvasBundle`] from a given image with the given configuration.
+    ///
+    /// Note that [`CanvasConfig::hdr`] will not be reflected in the bundle, add a [`bevy::render::view::Hdr`] component instead
+    /// or use [`CanvasCommands::spawn_canvas`].
     pub fn new(image: Handle<Image>, config: CanvasConfig) -> Self {
         Self {
             camera_2d: Camera2d,
@@ -214,18 +217,18 @@ pub trait CanvasCommands<'w> {
     ///
     /// Returns the created [`Handle<Image>`] and [`EntityCommands`].
     fn spawn_canvas(
-        &mut self,
+        &'_ mut self,
         assets: &mut Assets<Image>,
         config: CanvasConfig,
-    ) -> (Handle<Image>, EntityCommands);
+    ) -> (Handle<Image>, EntityCommands<'_>);
 }
 
 impl<'w, 's> CanvasCommands<'w> for Commands<'w, 's> {
     fn spawn_canvas(
-        &mut self,
+        &'_ mut self,
         assets: &mut Assets<Image>,
         config: CanvasConfig,
-    ) -> (Handle<Image>, EntityCommands) {
+    ) -> (Handle<Image>, EntityCommands<'_>) {
         let handle = Canvas::create_image(
             assets,
             config.width,

src/painter/canvas.rs

@@ -74,15 +74,15 @@ pub struct ShapeChildBuilder<'w> {
 impl<'w> ShapeChildBuilder<'w> {
     /// Spawns an entity with the given bundle and inserts it into the parent entity's [`Children`].
     /// Also adds [`Parent`] component to the created entity.
-    pub fn spawn(&mut self, bundle: impl Bundle) -> EntityCommands {
+    pub fn spawn(&'_ mut self, bundle: impl Bundle) -> EntityCommands<'_> {
         let e = self.commands.spawn(bundle);
         self.push_children.children.push(e.id());
         e
     }
 
     /// Spawns an [`Entity`] with no components and inserts it into the parent entity's [`Children`].
     /// Also adds [`Parent`] component to the created entity.
-    pub fn spawn_empty(&mut self) -> EntityCommands {
+    pub fn spawn_empty(&'_ mut self) -> EntityCommands<'_> {
         let e = self.commands.spawn_empty();
         self.push_children.children.push(e.id());
         e
@@ -101,7 +101,7 @@ impl<'w> ShapeChildBuilder<'w> {
 }
 
 impl<'w> ShapeSpawner<'w> for ShapeChildBuilder<'w> {
-    fn spawn_shape(&mut self, bundle: impl Bundle) -> ShapeEntityCommands {
+    fn spawn_shape(&'_ mut self, bundle: impl Bundle) -> ShapeEntityCommands<'_, '_> {
         let Self {
             commands, config, ..
         } = self;

src/painter/child_commands.rs

@@ -28,7 +28,7 @@ pub trait ShapeSpawner<'w>: DerefMut<Target = ShapeConfig> {
     /// Note: [`ShapeBundle`](crate::ShapeBundle) does not include [`RenderLayers`](bevy::render::view::RenderLayers) as there is no support for optional components
     /// so instead it is inserted in this function conditionally depending on the [`ShapeConfig`] in `self`
     /// Prefer the function for the shape you want over [`ShapeSpawner::spawn_shape`], e.g. `commands.rect(...)`
-    fn spawn_shape(&mut self, bundle: impl Bundle) -> ShapeEntityCommands;
+    fn spawn_shape(&'_ mut self, bundle: impl Bundle) -> ShapeEntityCommands<'_, '_>;
 }
 
 /// Plugin that setups up resources and systems for [`Canvas`] and [`ShapePainter`].

src/painter/mod.rs

@@ -25,7 +25,7 @@ impl<'w, 's> ShapeCommands<'w, 's> {
 }
 
 impl<'w, 's> ShapeSpawner<'w> for ShapeCommands<'w, 's> {
-    fn spawn_shape(&mut self, bundle: impl Bundle) -> ShapeEntityCommands {
+    fn spawn_shape(&'_ mut self, bundle: impl Bundle) -> ShapeEntityCommands<'_, '_> {
         let Self {
             commands, config, ..
         } = self;

src/painter/shape_commands.rs

@@ -234,16 +234,26 @@ impl DiscBundle for ShapeBundle<DiscComponent> {
 
 /// Extension trait for [`ShapeSpawner`] to enable spawning of entities for disc type shapes.
 pub trait DiscSpawner<'w> {
-    fn circle(&mut self, radius: f32) -> ShapeEntityCommands;
-    fn arc(&mut self, radius: f32, start_angle: f32, end_angle: f32) -> ShapeEntityCommands;
+    fn circle(&'_ mut self, radius: f32) -> ShapeEntityCommands<'_, '_>;
+    fn arc(
+        &'_ mut self,
+        radius: f32,
+        start_angle: f32,
+        end_angle: f32,
+    ) -> ShapeEntityCommands<'_, '_>;
 }
 
 impl<'w, T: ShapeSpawner<'w>> DiscSpawner<'w> for T {
-    fn circle(&mut self, radius: f32) -> ShapeEntityCommands {
+    fn circle(&'_ mut self, radius: f32) -> ShapeEntityCommands<'_, '_> {
         self.spawn_shape(ShapeBundle::circle(self.config(), radius))
     }
 
-    fn arc(&mut self, radius: f32, start_angle: f32, end_angle: f32) -> ShapeEntityCommands {
+    fn arc(
+        &'_ mut self,
+        radius: f32,
+        start_angle: f32,
+        end_angle: f32,
+    ) -> ShapeEntityCommands<'_, '_> {
         self.spawn_shape(ShapeBundle::arc(
             self.config(),
             radius,

src/shapes/disc.rs

@@ -159,11 +159,11 @@ impl LineBundle for ShapeBundle<LineComponent> {
 
 /// Extension trait for [`ShapeSpawner`] to enable spawning of line entities.
 pub trait LineSpawner<'w>: ShapeSpawner<'w> {
-    fn line(&mut self, start: Vec3, end: Vec3) -> ShapeEntityCommands;
+    fn line(&'_ mut self, start: Vec3, end: Vec3) -> ShapeEntityCommands<'_, '_>;
 }
 
 impl<'w, T: ShapeSpawner<'w>> LineSpawner<'w> for T {
-    fn line(&mut self, start: Vec3, end: Vec3) -> ShapeEntityCommands {
+    fn line(&'_ mut self, start: Vec3, end: Vec3) -> ShapeEntityCommands<'_, '_> {
         self.spawn_shape(ShapeBundle::line(self.config(), start, end))
     }
 }

src/shapes/line.rs

@@ -163,11 +163,11 @@ impl RectangleBundle for ShapeBundle<RectangleComponent> {
 
 /// Extension trait for [`ShapeSpawner`] to enable spawning of rectangle entities.
 pub trait RectangleSpawner<'w> {
-    fn rect(&mut self, size: Vec2) -> ShapeEntityCommands;
+    fn rect(&'_ mut self, size: Vec2) -> ShapeEntityCommands<'_, '_>;
 }
 
 impl<'w, T: ShapeSpawner<'w>> RectangleSpawner<'w> for T {
-    fn rect(&mut self, size: Vec2) -> ShapeEntityCommands {
+    fn rect(&'_ mut self, size: Vec2) -> ShapeEntityCommands<'_, '_> {
         self.spawn_shape(ShapeBundle::rect(self.config(), size))
     }
 }