fern_sim: Updated.

Author: jimblandy

fern_sim/Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "fern_sim"
 version = "0.1.0"
+edition = "2018"
 authors = ["You <you@example.com>"]
 license = "MIT"
 homepage = "https://fernsim.example.com/"

fern_sim/src/cells.rs

@@ -1,7 +1,9 @@
 //! Simulate the growth of ferns, from the level of
 //! individual cells on up.
 
-pub mod cells;
+#![warn(rust_2018_idioms)]
+#![allow(elided_lifetimes_in_paths)]
+
 pub mod plant_structures;
 pub mod simulation;
 pub mod spores;

fern_sim/src/lib.rs

@@ -2,5 +2,5 @@
 //! Simulation of individual leaves (for the formation of leaves, see `stem`).
 
 pub struct Leaf {
- x: bool
+ pub x: bool
 }

fern_sim/src/plant_structures/leaves.rs

@@ -43,3 +43,17 @@ impl Fern {
  self.stems.iter().all(|s| !s.furled)
  }
 }
+
+/// Create and return a [`VascularPath`] which represents the path of
+/// nutrients from the given [`Root`][r] to the given [`Leaf`](leaves::Leaf).
+///
+/// [r]: roots::Root
+pub fn trace_path(leaf: &leaves::Leaf, root: &roots::Root) -> VascularPath {
+ VascularPath { from: leaf.x, to: root.x }
+}
+
+#[doc(alias = "route")]
+pub struct VascularPath {
+ pub from: bool,
+ pub to: bool,
+}

fern_sim/src/plant_structures/mod.rs

@@ -1,7 +1,7 @@
 #![allow(dead_code)]
 
 pub struct Root {
- x: bool
+ pub x: bool
 }
 
 pub type RootSet = Vec<Root>;

fern_sim/src/plant_structures/roots.rs

@@ -3,6 +3,10 @@
 //! the feathery leaf structure that's the most immediately recognizable
 //! property of ferns.
 
+// in plant_structures/stems.rs
+pub mod xylem;
+pub mod phloem;
+
 pub struct Stem {
  pub furled: bool
 }

fern_sim/src/plant_structures/stems.rs

@@ -0,0 +1,6 @@
+//! Structures for distributing the products of photosynthesis.
+
+/// Tissue for translocating sucrose and other photosynthesis products.
+pub struct Phloem {
+ pub flow_rate: f32,
+}

fern_sim/src/plant_structures/stems/phloem.rs

@@ -0,0 +1,6 @@
+//! Structures for bringing nutrients from roots up to other parts of the plant.
+
+/// Vascular tissue for transporting water and nutrients from the roots.
+pub struct Xylem {
+ pub flow_rate: f32,
+}

fern_sim/src/plant_structures/stems/xylem.rs

@@ -4,7 +4,7 @@
 
 use std::fs::File;
 use std::time::Duration;
-use plant_structures::{Fern, FernType};
+use crate::plant_structures::{Fern, FernType};
 
 /// The simulated universe.
 pub struct Terrarium {