Clean up the dining philosophers example

README.md

@@ -25,7 +25,4 @@ how I can improve it with time and usage.
 
 ## Examples
 
-Check out [this example](examples/simple.rs) demonstrating a simple Petri net in action, as well as [the tests here](src/net.rs) for more Petri net instances.
-
-### More examples:
-- [Dining philosophers](examples/dining_philosophers.rs) (demonstrates competing for shared resources, and a deadlock situation)
+Examples can be found in the [`examples`](examples) directory.

examples/README.md

@@ -0,0 +1,9 @@
+## Examples
+
+---
+
+Check out [this example](simple.rs) demonstrating a simple Petri net in action, as well as [the tests here](../src/net.rs) for more Petri net instances.
+
+### [Dining philosophers](dining_philosophers.rs)
+
+An interactive demo illustrating competing for shared resources, and a deadlock situation.

src/net.rs

@@ -181,9 +181,7 @@ impl<Net: NetId> PetriNet<Net> {
 
 #[cfg(test)]
 mod tests {
-    use super::place::Place;
-    use super::trans::{Trans, W};
-    use super::{NetId, PetriNet};
+    use crate::{NetId, PetriNet, Place, Trans, W};
 
     enum Minimal {}
     enum ProdCons {}

src/net/place.rs

@@ -1,11 +1,12 @@
 //! Petri net places.
 
-use bevy_utils::StableHashMap;
-use educe::Educe;
 use std::any::{type_name, TypeId};
 use std::borrow::Cow;
 use std::marker::PhantomData;
 
+use bevy_utils::StableHashMap;
+use educe::Educe;
+
 use crate::net::NetId;
 
 /// Place belonging to a Petri net.

src/net/trans.rs

@@ -1,11 +1,12 @@
 //! Petri net transitions.
 
-use bevy_utils::StableHashMap;
-use educe::Educe;
 use std::any::{type_name, TypeId};
 use std::borrow::Cow;
 use std::marker::PhantomData;
 
+use bevy_utils::StableHashMap;
+use educe::Educe;
+
 use crate::net::place::{Place, PlaceId, PlaceMetadata};
 use crate::net::NetId;
 

src/token.rs

@@ -56,11 +56,7 @@ impl<Net: NetId> Token<Net> {
 
 #[cfg(test)]
 mod tests {
-    use crate::net::trans::{Trans, W};
-    use crate::net::PetriNet;
-    use crate::Place;
-
-    use super::*;
+    use crate::{NetId, PetriNet, Place, Trans, W};
 
     enum N0 {}
     enum P0 {}