Merge pull request amethyst#2693 from remilauzier/main

Fix some tests warnings

book/src/concepts/resource.md

@@ -65,7 +65,7 @@ If you want to get a resource and create it if it doesn't exist:
     // it will insert the instance we created earlier.
     let fetched = resources.get_or_insert_with(|| MyResource);
     // or
-    let fetched = resources.get_or_default::<MyResource>();
+    // let fetched = resources.get::<MyResource>();
 # }
 ```
 

book/src/concepts/state.md

@@ -200,7 +200,7 @@ use amethyst::{
     input::{is_key_down, VirtualKeyCode},
     prelude::*,
     ui::UiEvent,
-    winit::Event,
+    winit::event::Event,
 };
 
 #[derive(Clone, Debug)]

book/src/concepts/system.md

@@ -79,6 +79,7 @@ impl System for WalkPlayerUp {
             .unwrap()
             .prepend_translation_y(0.1);
     }
+    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
 }
 ```
 
@@ -119,6 +120,7 @@ impl System for MakeObjectsFall {
             }
         }
     }
+    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
 }
 ```
 
@@ -149,6 +151,7 @@ impl System for NotFallingObjects {
             transform.prepend_translation_y(0.1);
         }
     }
+    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
 }
 ```
 
@@ -174,7 +177,7 @@ impl System for SpawnEnemies {
     type SystemData = (
         .write_component::<Transform>()
         .write_component::<Enemy>()
-        Entities<'a>,
+        Entities,
     );
 
     fn run(&mut self, (mut transforms, mut enemies, entities): Self::SystemData) {
@@ -188,6 +191,7 @@ impl System for SpawnEnemies {
             self.counter = 0;
         }
     }
+    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
 }
 ```
 
@@ -203,11 +207,12 @@ Deleting an entity is very easy using `Entities<'a>`.
 #   entity: Entity,
 # }
 # impl System for MySystem {
-#   type SystemData = Entities<'a>;
+#   type SystemData = Entities;
 #   fn run(&mut self, entities: Self::SystemData) {
 #       let entity = self.entity;
         entities.delete(entity);
 #   }
+#    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
 # }
 ```
 
@@ -223,7 +228,7 @@ struct MakeObjectsFall;
 
 impl System for MakeObjectsFall {
     type SystemData = (
-        Entities<'a>,
+        Entities,
         .write_component::<Transform>()
       .read_component::<FallingObject>(),
     );
@@ -237,6 +242,7 @@ impl System for MakeObjectsFall {
             }
         }
     }
+    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
 }
 ```
 
@@ -263,6 +269,7 @@ To do that, you need to get a mutable storage of the component you want to modif
         // Remove the component
         write_storage.remove(entity);
 #   }
+#    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
 # }
 ```
 
@@ -441,6 +448,7 @@ impl System for MyGameplaySystem {
             _ => {}
         }
     }
+    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
 }
 ```
 
@@ -496,7 +504,7 @@ struct MySystemData<'a> {
 struct MyFirstSystem;
 
 impl System for MyFirstSystem {
-    type SystemData = MySystemData<'a>;
+    type SystemData = MySystemData;
 
     fn run(&mut self, mut data: Self::SystemData) {
         if data.baz.should_process() {
@@ -505,6 +513,7 @@ impl System for MyFirstSystem {
             }
         }
     }
+    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
 }
 ```
 

book/src/concepts/system/system_desc_derive.md

@@ -87,7 +87,9 @@ impl SystemName {
         }
     }
 }
-# impl System for SystemName {}
+# impl System for SystemName {
+#    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
+# }
 ```
 
 <details>
@@ -111,7 +113,9 @@ impl SystemName {
 #   }
 # }
 # 
-# impl System for SystemName {}
+# impl System for SystemName {
+#    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
+# }
 # 
 /// Builds a `SystemName`.
 #[derive(Default, Debug)]
@@ -145,7 +149,9 @@ will call  `SystemName::default()`:
 pub struct SystemName {
     field_0: u32,
 }
-# impl System for SystemName {}
+# impl System for SystemName {
+#    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
+# }
 ```
 
 <details>
@@ -160,7 +166,9 @@ pub struct SystemName {
 #   field_0: u32,
 # }
 # 
-# impl System for SystemName {}
+# impl System for SystemName {
+#   fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
+# }
 # 
 /// Builds a `SystemName`.
 #[derive(Debug)]
@@ -200,7 +208,9 @@ impl SystemName {
         SystemName { reader_id }
     }
 }
-# impl System for SystemName {}
+# impl System for SystemName {
+#    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
+# }
 ```
 
 <details>
@@ -224,7 +234,9 @@ impl SystemName {
 #   }
 # }
 # 
-# impl System for SystemName {}
+# impl System for SystemName {
+#    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
+# }
 # 
 /// Builds a `SystemName`.
 #[derive(Debug)]
@@ -326,6 +338,7 @@ pub struct SystemName;
 
 impl System for SystemName {
     type SystemData = ReadExpect<'a, NonDefault>;
+    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
 }
 ```
 
@@ -342,7 +355,8 @@ impl System for SystemName {
 # pub struct SystemName;
 # 
 # impl System for SystemName {
-#   type SystemData = ReadExpect<'a, NonDefault>;
+#   type SystemData = ReadExpect<NonDefault>;
+#   fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
 # }
 # 
 /// Builds a `SystemName`.

book/src/concepts/world.md

@@ -58,7 +58,7 @@ This is almost the same as accessing a component:
 # fn main() {
   let mut world = World::default();
     let my_entity =     world.push((MyComponent::default(),));
-    if let Some(entry) = world.entry(my_entity) {
+    if let Some(mut entry) = world.entry(my_entity) {
         let mut my_component = entry.get_component_mut::<MyComponent>().unwrap();
         my_component.value = 5;
     }

book/src/controlling_system_execution/custom_game_data.md

@@ -258,6 +258,7 @@ The only thing that remains now is to use our `CustomDispatcherBuilder` when bui
 #   utils::application_root_dir,
 #   DataDispose, DataInit, Error,
 # };
+# use amethyst_rendy::bundle::Target::Main;
 # 
 # pub struct CustomGameData<'a, 'b> {
 #   core_dispatcher: Option<Dispatcher>,
@@ -281,7 +282,7 @@ The only thing that remains now is to use our `CustomDispatcherBuilder` when bui
 #   }
 #   pub fn with_base_bundle<B>(mut self, world: &mut World, bundle: B) -> Result<Self, Error>
 #   where
-#       B: SystemBundle<'a, 'b>,
+#       B: SystemBundle<>,
 #   {
 #       unimplemented!()
 #   }

book/src/controlling_system_execution/state-specific_dispatcher.md

@@ -26,8 +26,8 @@ To add `System`s to the `DispatcherBuilder` we use a similar syntax to the one w
 # };
 #
 # struct MoveBallsSystem; struct MovePaddlesSystem;
-# impl System for MoveBallsSystem { fn run(&mut self, _: ()) {} }
-# impl System for MovePaddlesSystem { fn run(&mut self, _: ()) {} }
+# impl System for MoveBallsSystem { fn run(&mut self, _: ()) {} fn build(self) -> Box<(dyn ParallelRunnable + 'static)> { Ok(()) }}
+# impl System for MovePaddlesSystem { fn run(&mut self, _: ()) {} fn build(self) -> Box<(dyn ParallelRunnable + 'static)> { Ok(()) }}
 let mut dispatcher_builder = DispatcherBuilder::new();
 
 dispatcher_builder.add(MoveBallsSystem, "move_balls_system", &[]);
@@ -45,10 +45,11 @@ Alternatively we can add `Bundle`s of `System`s to our `DispatcherBuilder` direc
 #     prelude::*,
 # };
 # #[derive(Default)] struct PongSystemsBundle;
-# impl SystemBundle<'a, 'b> for PongSystemsBundle {
+# impl SystemBundle<> for PongSystemsBundle {
 #     fn build(self, _: &mut World, _: &mut DispatcherBuilder) -> Result<(), amethyst::Error> {
 #         Ok(())
 #     }
+#     fn load(&mut self, _: &mut World, _: &mut Resources, _: &mut DispatcherBuilder) -> Result<(), amethyst::Error> { Ok(())}
 # }
 #
 # let mut world = World::default();

book/src/input/handling_input.md

@@ -16,7 +16,7 @@ use amethyst::{input::InputBundle, prelude::*};
     let mut world = World::default();
     let game_data = DispatcherBuilder::default()
         //..
-        .add_bundle(input_bundle)?;
+        .add_bundle(input_bundle);
 
 #   Ok(())
 # }
@@ -36,6 +36,8 @@ struct ExampleSystem;
 
 impl System for ExampleSystem {
     type SystemData = .read_resource::<InputHandler>();
+
+    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> { Ok(()) }
 
     fn run(&mut self, input: Self::SystemData) {
         // Gets mouse coordinates
@@ -68,6 +70,7 @@ Now you have to add the `System` to the game data, like you would do with any ot
 # struct ExampleSystem;
 # impl System for ExampleSystem {
 #   fn run(&mut self, _: ()) {}
+#   fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
 # }
 # fn main() {
     let game_data = DispatcherBuilder::default()
@@ -168,6 +171,7 @@ impl System for MovementSystem {
             }
         }
     }
+    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
 }
 ```
 

book/src/pong-tutorial/pong-tutorial-01.md

@@ -19,24 +19,24 @@ authors = []
 edition = "2018"
 
 [dependencies.amethyst]
-version = "0.15"
+version = "0.16"
 features = ["vulkan"]
 ```
 
 Alternatively, if you are developing on macOS, you might want to use the `metal` rendering backend instead of `vulkan`. In this case, you should change the `features` entry in the `amethyst` dependency table.
 
 ```toml
 [dependencies.amethyst]
-version = "0.15"
+version = "0.16"
 features = ["metal"]
 ```
 
 We can start with editing the `main.rs` file inside `src` directory.
 You can delete everything in that file, then add these imports:
 
 ```rust
-# extern crate amethyst;
 //! Pong Tutorial 1
+# extern crate amethyst;
 
 use amethyst::{
     prelude::*,
@@ -69,6 +69,8 @@ used by Amethyst's state machine to start, stop, and update the game.
 
 ```rust
 # extern crate amethyst;
+# use amethyst::SimpleState;
+# struct Pong;
 impl SimpleState for Pong {}
 ```
 
@@ -131,7 +133,7 @@ project manually, go ahead and create it now.
 In either case, open `display.ron` and change its contents to the
 following:
 
-```rust
+```ron
 (
     title: "Pong!",
     dimensions: Some((500, 500)),
@@ -233,7 +235,7 @@ Last time we left our `DispatcherBuilder` instance empty, now we'll add some sys
             )
             // RenderFlat2D plugin is used to render entities with a `SpriteRender` component.
             .with_plugin(RenderFlat2D::default()),
-    )?;
+    );
 #   Ok(())
 # }
 ```

book/src/pong-tutorial/pong-tutorial-02.md

@@ -30,7 +30,7 @@ initialization code from the Pong code.
    use amethyst::{
        assets::{AssetStorage, DefaultLoader, Handle, Loader},
        core::transform::Transform,
-       ecs::Component,
+       ecs::component,
        prelude::*,
        renderer::{Camera, ImageFormat, SpriteRender, SpriteSheet, SpriteSheetFormat, Texture},
    };
@@ -346,7 +346,7 @@ fn main() -> amethyst::Result<()> {
     let game_data = DispatcherBuilder::default()
         // ...
         // Add the transform bundle which handles tracking entity positions
-        .add_bundle(TransformBundle::new())?;
+        .add_bundle(TransformBundle::new());
 
 #   let assets_dir = "/";
 #   let mut game = Application::new(assets_dir, Pong, game_data)?;

book/src/pong-tutorial/pong-tutorial-03.md

@@ -151,6 +151,7 @@ impl System for PaddleSystem {
             }
         }
     }
+    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
 }
 # fn main() {}
 ```
@@ -223,9 +224,9 @@ fn main() -> amethyst::Result<()> {
 // ...
 .add_bundle(TransformBundle::new())?
 .add_bundle(input_bundle)?
-.with(systems::PaddleSystem, "paddle_system", &["input_system"]) // Add this line
+.with(systems::PaddleSystem, "paddle_system", &["input_system"]); // Add this line
 // ...
-#;
+#
 #   let assets_dir = "/";
 #   struct Pong;
 #   impl SimpleState for Pong {}
@@ -279,6 +280,7 @@ component of the transform's translation.
             }
         }
     }
+    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> {}
 # }
 ```
 
@@ -341,6 +343,7 @@ Our run function should now look something like this:
             }
         }
     }
+    fn build(self) -> Box<(dyn ParallelRunnable + 'static)> { Ok(())}
 # }
 ```