From 3e1c24e5331429f7b8875b31f08e7d6cb7796f2d Mon Sep 17 00:00:00 2001
From: Maximilian Ammann <max@maxammann.org>
Date: Sat, 17 Sep 2022 15:48:41 +0200
Subject: [PATCH] Fix formatting

---
 maplibre-demo/src/headed.rs          | 3 +--
 maplibre-winit/src/winit/mod.rs      | 3 +--
 maplibre/src/headless.rs             | 3 +--
 maplibre/src/io/apc.rs               | 3 +--
 maplibre/src/stages/mod.rs           | 6 +++---
 maplibre/src/stages/request_stage.rs | 5 ++---
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/maplibre-demo/src/headed.rs b/maplibre-demo/src/headed.rs
index b4ef868e..3462984c 100644
--- a/maplibre-demo/src/headed.rs
+++ b/maplibre-demo/src/headed.rs
@@ -1,6 +1,5 @@
-use maplibre::io::transferables::DefaultTransferables;
 use maplibre::{
-    io::apc::SchedulerAsyncProcedureCall,
+    io::{apc::SchedulerAsyncProcedureCall, transferables::DefaultTransferables},
     platform::{http_client::ReqwestHttpClient, scheduler::TokioScheduler},
     MapBuilder,
 };
diff --git a/maplibre-winit/src/winit/mod.rs b/maplibre-winit/src/winit/mod.rs
index 68d27074..7407bf61 100644
--- a/maplibre-winit/src/winit/mod.rs
+++ b/maplibre-winit/src/winit/mod.rs
@@ -1,7 +1,6 @@
 use std::{cell::RefCell, marker::PhantomData, ops::Deref, rc::Rc};
 
 use instant::Instant;
-use maplibre::io::transferables::DefaultTransferables;
 use maplibre::{
     environment::Environment,
     error::Error,
@@ -9,7 +8,7 @@ use maplibre::{
         apc::{AsyncProcedureCall, Message},
         scheduler::Scheduler,
         source_client::HttpClient,
-        transferables::Transferables,
+        transferables::{DefaultTransferables, Transferables},
     },
     map_schedule::InteractiveMapSchedule,
     window::{EventLoop, HeadedMapWindow, MapWindowConfig},
diff --git a/maplibre/src/headless.rs b/maplibre/src/headless.rs
index 4c9a9127..82e4f2e2 100644
--- a/maplibre/src/headless.rs
+++ b/maplibre/src/headless.rs
@@ -12,7 +12,6 @@ use std::{
 use tokio::{runtime::Handle, task};
 use wgpu::{BufferAsyncError, BufferSlice};
 
-use crate::io::transferables::DefaultTransferables;
 use crate::{
     context::{MapContext, ViewState},
     coords::{LatLon, ViewRegion, WorldCoords, WorldTileCoords, Zoom, TILE_SIZE},
@@ -24,7 +23,7 @@ use crate::{
         source_client::HttpSourceClient,
         tile_pipelines::build_vector_tile_pipeline,
         tile_repository::{StoredLayer, TileRepository},
-        transferables::Transferables,
+        transferables::{DefaultTransferables, Transferables},
         TileRequest,
     },
     render::{
diff --git a/maplibre/src/io/apc.rs b/maplibre/src/io/apc.rs
index 13ac5ed7..08f74c39 100644
--- a/maplibre/src/io/apc.rs
+++ b/maplibre/src/io/apc.rs
@@ -10,12 +10,11 @@ use std::{
 
 use serde::{Deserialize, Serialize};
 
-use crate::io::transferables::DefaultTransferables;
 use crate::{
     coords::WorldTileCoords,
     io::{
         source_client::{HttpSourceClient, SourceClient},
-        transferables::Transferables,
+        transferables::{DefaultTransferables, Transferables},
         TileRequest,
     },
     Environment, HttpClient, Scheduler,
diff --git a/maplibre/src/stages/mod.rs b/maplibre/src/stages/mod.rs
index bd202db0..2de4b96c 100644
--- a/maplibre/src/stages/mod.rs
+++ b/maplibre/src/stages/mod.rs
@@ -10,7 +10,6 @@ use std::{
 use geozero::{mvt::tile, GeozeroDatasource};
 use request_stage::RequestStage;
 
-use crate::io::transferables::DefaultTransferables;
 use crate::{
     coords::{WorldCoords, WorldTileCoords, Zoom, ZoomLevel},
     error::Error,
@@ -21,8 +20,9 @@ use crate::{
         source_client::HttpSourceClient,
         tile_pipelines::build_vector_tile_pipeline,
         transferables::{
-            DefaultTessellatedLayer, DefaultTileTessellated, DefaultUnavailableLayer,
-            TessellatedLayer, TileTessellated, Transferables, UnavailableLayer,
+            DefaultTessellatedLayer, DefaultTileTessellated, DefaultTransferables,
+            DefaultUnavailableLayer, TessellatedLayer, TileTessellated, Transferables,
+            UnavailableLayer,
         },
         TileRequest,
     },
diff --git a/maplibre/src/stages/request_stage.rs b/maplibre/src/stages/request_stage.rs
index 5c8ff901..ccc26d7e 100644
--- a/maplibre/src/stages/request_stage.rs
+++ b/maplibre/src/stages/request_stage.rs
@@ -12,18 +12,17 @@ use std::{
     str::FromStr,
 };
 
-use crate::io::apc::Message;
-use crate::io::transferables::{Transferables, UnavailableLayer};
 use crate::{
     context::MapContext,
     coords::{ViewRegion, WorldTileCoords, ZoomLevel},
     error::Error,
     io::{
-        apc::{AsyncProcedureCall, AsyncProcedureFuture, Context, Input},
+        apc::{AsyncProcedureCall, AsyncProcedureFuture, Context, Input, Message},
         pipeline::{PipelineContext, Processable},
         source_client::{HttpSourceClient, SourceClient},
         tile_pipelines::build_vector_tile_pipeline,
         tile_repository::TileRepository,
+        transferables::{Transferables, UnavailableLayer},
         TileRequest,
     },
     schedule::Stage,