cargo fmt

Author: not-elm

.github/workflows/ci.yml

@@ -70,6 +70,7 @@ jobs:
         run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
       - name: Run clippy
         run: cargo clippy --workspace --all-targets --all-features -- -Dwarnings
-
+      - name: Check format
+        run: cargo fmt --all -- --check
 
 

CHANGELOG.md

@@ -1,3 +1,11 @@
+## v0.11.1
+[Release note](https://github.com/not-elm/bevy_flurx/releases/tag/v0.11.1)
+
+### Others
+
+- Excluded `assets` directory from publication.
+- Use rustfmt to format the code.
+
 ## v0.11.0
 [Release note](https://github.com/not-elm/bevy_flurx/releases/tag/v0.11.0)
 

Cargo.toml

@@ -1,12 +1,13 @@
 [package]
 name = "bevy_flurx"
-version = "0.11.0"
+version = "0.11.1"
 edition = "2021"
 authors = ["notelm <elmprograminfo@gmail.com>"]
 categories = ["asynchronous", "game-development"]
 description = "Allows you to use coroutine in Bevy"
 keywords = ["game", "gamedev", "bevy", "async"]
 license = "MIT OR Apache-2.0"
+exclude = ["assets/"]
 readme = "README.md"
 repository = "https://github.com/not-elm/bevy_flurx"
 
@@ -51,10 +52,10 @@ tokio = { version = "1", optional = true, features = ["sync", "time"] }
 async-compat = { version = "0.2", optional = true }
 
 [dev-dependencies]
-bevy = { version = "0.16.0" }
+bevy = { version = "0.16" }
 bevy_test_helper = { git = "https://github.com/not-elm/bevy_test_helper", branch = "v0.16" }
 futures = "0.3"
-criterion = { version = "0.5", features = ["plotters", "html_reports"] }
+criterion = { version = "0.6", features = ["plotters", "html_reports"] }
 
 [features]
 default = []

assets/audio/higurashi.ogg

@@ -15,19 +15,16 @@ fn with_flurx(c: &mut Criterion) {
     c.bench_function("repeat action", move |b| {
         b.iter(move || {
             let mut app = App::new();
-            app
-                .add_plugins((
-                    TaskPoolPlugin::default(),
-                    FlurxPlugin
-                ))
+            app.add_plugins((TaskPoolPlugin::default(), FlurxPlugin))
                 .init_resource::<Exit>()
-                .add_systems(Startup,  |mut commands: Commands| {
+                .add_systems(Startup, |mut commands: Commands| {
                     commands.spawn(Reactor::schedule(|task| async move {
                         for _ in 0..10000 {
                             task.will(Update, wait::until(|| true)).await;
                             task.will(Update, delay::frames().with(1)).await;
                         }
-                        task.will(Update, once::res::insert().with(Exit(true))).await;
+                        task.will(Update, once::res::insert().with(Exit(true)))
+                            .await;
                     }));
                 });
 
@@ -39,4 +36,4 @@ fn with_flurx(c: &mut Criterion) {
 }
 
 criterion_group!(repeat, with_flurx);
-criterion_main!(repeat);
+criterion_main!(repeat);

benches/repeat.rs

@@ -14,11 +14,7 @@ fn single_action(c: &mut Criterion) {
     c.bench_function("single action", move |b| {
         b.iter(move || {
             let mut app = App::new();
-            app
-                .add_plugins((
-                    TaskPoolPlugin::default(),
-                    FlurxPlugin
-                ))
+            app.add_plugins((TaskPoolPlugin::default(), FlurxPlugin))
                 .init_resource::<Exit>()
                 .add_systems(Startup, |mut commands: Commands| {
                     commands.spawn(Reactor::schedule(|task| async move {
@@ -27,10 +23,13 @@ fn single_action(c: &mut Criterion) {
                                 *local += 1;
                                 *local == 10000
                             })
-                                .then(once::run(|mut exit: ResMut<Exit>| {
+                            .then(once::run(
+                                |mut exit: ResMut<Exit>| {
                                     exit.0 = true;
-                                }))
-                        }).await;
+                                },
+                            ))
+                        })
+                        .await;
                     }));
                 });
 
@@ -42,4 +41,4 @@ fn single_action(c: &mut Criterion) {
 }
 
 criterion_group!(single, single_action);
-criterion_main!(single);
+criterion_main!(single);

benches/single.rs

@@ -7,32 +7,34 @@ struct S;
 
 fn main() {
     App::new()
-        .add_plugins((
-            DefaultPlugins,
-            FlurxPlugin
-        ))
+        .add_plugins((DefaultPlugins, FlurxPlugin))
         .add_systems(Startup, setup)
-        .add_systems(Update, (
-            console_switch_just_on::<1>.run_if(switch_just_turned_on::<S>),
-            console_switch_just_on::<2>.run_if(switch_just_turned_on::<S>),
-            console_switch_just_off::<1>.run_if(switch_just_turned_off::<S>),
-            console_switch_just_off::<2>.run_if(switch_just_turned_off::<S>)
-        ))
+        .add_systems(
+            Update,
+            (
+                console_switch_just_on::<1>.run_if(switch_just_turned_on::<S>),
+                console_switch_just_on::<2>.run_if(switch_just_turned_on::<S>),
+                console_switch_just_off::<1>.run_if(switch_just_turned_off::<S>),
+                console_switch_just_off::<2>.run_if(switch_just_turned_off::<S>),
+            ),
+        )
         .run();
 }
 
-fn setup(
-    mut commands: Commands
-) {
+fn setup(mut commands: Commands) {
     commands.spawn(Reactor::schedule(|task| async move {
         loop {
-            task.will(Update, wait::input::just_pressed().with(KeyCode::KeyT)
-                .then(once::switch::on::<S>())
-                .then(delay::frames().with(1))
-                .then(wait::input::just_pressed().with(KeyCode::KeyT))
-                .then(once::switch::off::<S>())
-                .then(delay::frames().with(1)),
-            ).await;
+            task.will(
+                Update,
+                wait::input::just_pressed()
+                    .with(KeyCode::KeyT)
+                    .then(once::switch::on::<S>())
+                    .then(delay::frames().with(1))
+                    .then(wait::input::just_pressed().with(KeyCode::KeyT))
+                    .then(once::switch::off::<S>())
+                    .then(delay::frames().with(1)),
+            )
+            .await;
         }
     }));
 }

examples/bug_check/switch_just_change.rs

@@ -15,10 +15,7 @@ struct Cancel;
 
 fn main() {
     App::new()
-        .add_plugins((
-            DefaultPlugins,
-            FlurxPlugin,
-        ))
+        .add_plugins((DefaultPlugins, FlurxPlugin))
         .add_systems(Startup, (setup_camera_and_box, spawn_reactor))
         .add_systems(Update, cancel)
         .run();

examples/cancel.rs

@@ -9,11 +9,7 @@ use std::time::Duration;
 
 fn main() {
     App::new()
-        .add_plugins((
-            MinimalPlugins,
-            LogPlugin::default(),
-            FlurxPlugin,
-        ))
+        .add_plugins((MinimalPlugins, LogPlugin::default(), FlurxPlugin))
         .add_systems(Startup, spawn_reactor)
         .run();
 }
@@ -27,7 +23,8 @@ fn spawn_reactor(mut commands: Commands) {
                     message: "After 3 seconds, this message is displayed.",
                 }))
                 .then(once::event::app_exit_success())
-        }).await;
+        })
+        .await;
     }));
 }
 
@@ -46,8 +43,12 @@ struct DelayedLogRunner {
 }
 
 impl Runner for DelayedLogRunner {
-    fn run(&mut self, world: &mut World, cancellation_handlers: &mut CancellationHandlers) -> RunnerIs {
-        let cancellation_id = self.cancellation_id.get_or_insert_with(||{
+    fn run(
+        &mut self,
+        world: &mut World,
+        cancellation_handlers: &mut CancellationHandlers,
+    ) -> RunnerIs {
+        let cancellation_id = self.cancellation_id.get_or_insert_with(|| {
             // You can register a handler that will be invoked when the reactor is canceled.
             cancellation_handlers.register(|_world: &mut World| {
                 info!("CancellationLogRunner is canceled.");
@@ -62,13 +63,13 @@ impl Runner for DelayedLogRunner {
                 cancellation_handlers.unregister(cancellation_id);
                 RunnerIs::Completed
             }
-            other => other
+            other => other,
         }
     }
 }
 
 /// Finally, we create a function that returns an action.
-/// 
+///
 /// It is recommended that the action's input is passed by the [`ActionSeed::with`] instead of the argument of this function.
 /// By doing so, you can pass the input value with [`Pipe::pipe`].
 fn delayed_log() -> ActionSeed<DelayedLogInput, &'static str> {
@@ -82,4 +83,4 @@ fn delayed_log() -> ActionSeed<DelayedLogInput, &'static str> {
             cancellation_id: None,
         }
     })
-}
+}

examples/custom_runner.rs

@@ -135,7 +135,7 @@ fn cut_in_ferris(
     mut tick: Local<f32>,
     time: Res<Time>,
 ) {
-    let Ok((mut t, StartPos(start))) = ferris.single_mut() else{
+    let Ok((mut t, StartPos(start))) = ferris.single_mut() else {
         return;
     };
     let end = Duration::from_millis(300).as_secs_f32();
@@ -155,5 +155,6 @@ fn move_left_down<const SPEED: u16>(
     time: Res<Time>,
 ) {
     let d = time.delta_secs() * SPEED as f32;
-    ferris.single_mut().unwrap().translation -= bg.single().unwrap().rotation * Vec3::new(d, 0., 0.);
+    ferris.single_mut().unwrap().translation -=
+        bg.single().unwrap().rotation * Vec3::new(d, 0., 0.);
 }