Update dependencies.

Author: partim

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "railmap"
-version = "0.1.17"
+version = "0.1.18"
 authors = ["Martin Hoffmann <hn@nvnc.de>"]
 edition = "2021"
 rust-version = "1.65"
@@ -9,19 +9,19 @@ rust-version = "1.65"
 
 [dependencies]
 arc-swap = "1.7.1"
-cairo-rs = { version = "0.20", features = ["png", "svg", "v1_16"] }
+cairo-rs = { version = "0.21", features = ["png", "svg", "v1_16"] }
 clap = { version = "4.3.19", features = ["cargo", "derive"] }
 femtomap = { git = "https://github.com/partim/femtomap.git", features = [ "serde" ] }
 http-body-util = "0.1"
 hyper = { version = "1.2", features = ["server", "http1"] }
 hyper-util = { version = "0.1", features = ["tokio"] }
 kurbo = "0.11"
 lazy_static = "1.4"
-lru = "0.12"
+lru = "0.16"
 notify = "7"
 serde = { version = "1", features = ["derive"] }
 tokio = { version = "1.27", features = ["macros", "net", "rt-multi-thread"] }
-toml = "0.8"
+toml = "0.9"
 
 [[bin]]
 name = "railmap"

Cargo.toml

@@ -32,7 +32,7 @@ impl Feature for AreaContour {
 
     fn shape(
         &self, style: &Style, _canvas: &Canvas
-    ) -> AnyShape {
+    ) -> AnyShape<'_> {
         let color = style.track_color(&self.class);
         let outline = self.trace.outline(style);
 
@@ -71,7 +71,7 @@ impl Feature for PlatformContour {
 
     fn shape(
         &self, style: &Style, _canvas: &Canvas
-    ) -> AnyShape {
+    ) -> AnyShape<'_> {
         let color = style.track_color(&self.class);
         let outline = self.trace.outline(style);
 

src/railway/feature/area.rs

@@ -101,7 +101,7 @@ impl Feature for BorderContour {
 
     fn shape(
         &self, style: &Style, _canvas: &Canvas
-    ) -> AnyShape {
+    ) -> AnyShape<'_> {
         let outline = self.trace.outline(style);
         if style.detail() < 3 {
             AnyShape::single_stage(move |style: &Style, canvas: &mut Canvas| {

src/railway/feature/border.rs

@@ -148,7 +148,7 @@ impl Feature for DotMarker {
 
     fn shape(
         &self, style: &Style, _canvas: &Canvas
-    ) -> AnyShape {
+    ) -> AnyShape<'_> {
         DotShape {
             feature: self,
             center: self.position.resolve(style).0

src/railway/feature/dot.rs

@@ -55,7 +55,7 @@ impl Feature for GuideContour {
 
     fn shape(
         &self, style: &Style, _canvas: &Canvas
-    ) -> AnyShape {
+    ) -> AnyShape<'_> {
         GuideShape {
             contour: self, trace: self.trace.outline(style)
         }.into()

src/railway/feature/guide.rs

@@ -72,7 +72,7 @@ impl Feature for Label {
 
     fn shape(
         &self, style: &Style, canvas: &Canvas
-    ) -> AnyShape {
+    ) -> AnyShape<'_> {
         let (point, angle) = self.position.resolve_label(style, self.on_path);
         let matrix = Matrix::identity().translate(point).rotate(angle);
         let layout = self.block.shape(Default::default(), style, canvas);

src/railway/feature/label.rs

@@ -150,7 +150,7 @@ impl Feature for StandardMarker {
 
     fn shape(
         &self, _style: &Style, _canvas: &Canvas
-    ) -> AnyShape {
+    ) -> AnyShape<'_> {
         AnyShape::single_stage(|style: &Style, canvas: &mut Canvas| {
             self.render(style, canvas)
         })

src/railway/feature/marker.rs

@@ -67,7 +67,7 @@ pub trait Feature {
 
     fn shape(
         &self, style: &Style, canvas: &Canvas
-    ) -> AnyShape;
+    ) -> AnyShape<'_>;
 }
 
 //------------ Shape ---------------------------------------------------------

src/railway/feature/mod.rs

@@ -294,7 +294,7 @@ impl Feature for TrackContour {
 
     fn shape(
         &self, style: &Style, _canvas: &Canvas
-    ) -> AnyShape {
+    ) -> AnyShape<'_> {
         /*
         if style.detail() <= 1 {
             AnyShape::from(
@@ -1654,7 +1654,7 @@ impl Feature for TrackCasing {
 
     fn shape(
         &self, style: &Style, _canvas: &Canvas
-    ) -> AnyShape {
+    ) -> AnyShape<'_> {
         let line_width = if self.class.double() {
             2.2 * style.measures().dt()
         }