Collect all worldgen code into the worldgen module

Author: patowen

common/src/lib.rs

@@ -26,10 +26,8 @@ mod margins;
 pub mod math;
 pub mod node;
 pub mod peer_traverser;
-mod plane;
 pub mod proto;
 mod sim_config;
-pub mod terraingen;
 pub mod traversal;
 pub mod voxel_math;
 pub mod world;

common/src/peer_traverser.rs

@@ -177,26 +177,21 @@ struct AssertingGraphRef<'a> {
 }
 
 impl AsRef<Graph> for AssertingGraphRef<'_> {
-    #[inline]
     fn as_ref(&self) -> &Graph {
         self.graph
     }
 }
 
-impl GraphRef for AssertingGraphRef<'_> {
-    #[inline]
+impl<'a> GraphRef for AssertingGraphRef<'a> {
     fn depth(&self, node: NodeId) -> u32 {
         self.graph.depth(node)
     }
 
-    #[inline]
     fn neighbor(&mut self, node: NodeId, side: Side) -> NodeId {
         self.graph.neighbor(node, side).unwrap()
     }
 
-    #[inline]
-    #[allow(refining_impl_trait)]
-    fn parents(&self, node: NodeId) -> impl ExactSizeIterator<Item = (Side, NodeId)> + use<> {
+    fn parents(&self, node: NodeId) -> impl ExactSizeIterator<Item = (Side, NodeId)> + use<'a> {
         self.graph.parents(node)
     }
 }
@@ -206,26 +201,21 @@ struct ExpandingGraphRef<'a> {
     graph: &'a mut Graph,
 }
 
-impl GraphRef for ExpandingGraphRef<'_> {
-    #[inline]
+impl<'a> GraphRef for ExpandingGraphRef<'a> {
     fn depth(&self, node: NodeId) -> u32 {
         self.graph.depth(node)
     }
 
-    #[inline]
     fn neighbor(&mut self, node: NodeId, side: Side) -> NodeId {
         self.graph.ensure_neighbor(node, side)
     }
 
-    #[inline]
-    #[allow(refining_impl_trait)]
-    fn parents(&self, node: NodeId) -> impl ExactSizeIterator<Item = (Side, NodeId)> + use<> {
+    fn parents(&self, node: NodeId) -> impl ExactSizeIterator<Item = (Side, NodeId)> + use<'a> {
         self.graph.parents(node)
     }
 }
 
 impl AsRef<Graph> for ExpandingGraphRef<'_> {
-    #[inline]
     fn as_ref(&self) -> &Graph {
         self.graph
     }

common/src/worldgen.rs renamed to common/src/worldgen/mod.rs

@@ -1,19 +1,21 @@
 use horosphere::{HorosphereChunk, HorosphereNode};
+use plane::Plane;
 use rand::{Rng, SeedableRng, distr::Uniform};
 use rand_distr::Normal;
+use terraingen::VoronoiInfo;
 
 use crate::{
     dodeca::{Side, Vertex},
     graph::{Graph, NodeId},
     margins,
     math::{self, MVector},
     node::{ChunkId, VoxelData},
-    plane::Plane,
-    terraingen::VoronoiInfo,
     world::Material,
 };
 
 mod horosphere;
+mod plane;
+mod terraingen;
 
 #[derive(Clone, Copy, PartialEq, Debug)]
 enum NodeStateKind {