From 87ad55969cd14b5c3b05a670c77be3e913da3cf9 Mon Sep 17 00:00:00 2001 From: Piotr Podusowski Date: Wed, 20 Nov 2024 22:11:07 +0100 Subject: [PATCH 1/2] shorten types --- walkers/src/tiles.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/walkers/src/tiles.rs b/walkers/src/tiles.rs index 7ae95e3..d8f3352 100644 --- a/walkers/src/tiles.rs +++ b/walkers/src/tiles.rs @@ -1,5 +1,6 @@ use egui::{pos2, Color32, Context, Mesh, Rect, Vec2}; use egui::{ColorImage, TextureHandle}; +use futures::channel::mpsc::{channel, Receiver, Sender}; use image::ImageError; use lru::LruCache; @@ -76,10 +77,10 @@ pub struct HttpTiles { cache: LruCache>, /// Tiles to be downloaded by the IO thread. - request_tx: futures::channel::mpsc::Sender, + request_tx: Sender, /// Tiles that got downloaded and should be put in the cache. - tile_rx: futures::channel::mpsc::Receiver<(TileId, Texture)>, + tile_rx: Receiver<(TileId, Texture)>, #[allow(dead_code)] // Significant Drop runtime: Runtime, @@ -106,8 +107,8 @@ impl HttpTiles { // Minimum value which didn't cause any stalls while testing. let channel_size = 20; - let (request_tx, request_rx) = futures::channel::mpsc::channel(channel_size); - let (tile_tx, tile_rx) = futures::channel::mpsc::channel(channel_size); + let (request_tx, request_rx) = channel(channel_size); + let (tile_tx, tile_rx) = channel(channel_size); let attribution = source.attribution(); let tile_size = source.tile_size(); let max_zoom = source.max_zoom(); From 62a09883c998a8cc65d50bc90ef2c48407274320 Mon Sep 17 00:00:00 2001 From: Piotr Podusowski Date: Wed, 20 Nov 2024 22:12:08 +0100 Subject: [PATCH 2/2] comment moved --- walkers/src/tiles.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/walkers/src/tiles.rs b/walkers/src/tiles.rs index d8f3352..975f5ee 100644 --- a/walkers/src/tiles.rs +++ b/walkers/src/tiles.rs @@ -121,12 +121,13 @@ impl HttpTiles { egui_ctx, )); + // Just arbitrary value which seemed right. #[allow(clippy::unwrap_used)] - let cap = std::num::NonZeroUsize::new(256).unwrap(); + let cache_size = std::num::NonZeroUsize::new(256).unwrap(); Self { attribution, - cache: LruCache::new(cap), // Just arbitrary value which seemed right. + cache: LruCache::new(cache_size), request_tx, tile_rx, runtime,