diff --git a/platform/rust/build.rs b/platform/rust/build.rs index 93abb3c430c..186230dad80 100644 --- a/platform/rust/build.rs +++ b/platform/rust/build.rs @@ -42,9 +42,9 @@ fn create_cmake_config(project_root: &Path) -> cmake::Config { panic!("Features 'metal', 'opengl', and 'vulkan' are mutually exclusive. Please enable only one."); } - cfg.define_bool("MLN_WITH_OPENGL", with_opengl); - cfg.define_bool("MLN_WITH_METAL", with_metal); - cfg.define_bool("MLN_WITH_VULKAN", with_vulkan); + cfg.define_bool("MLN_WITH_OPENGL", with_opengl); + cfg.define_bool("MLN_WITH_METAL", with_metal); + cfg.define_bool("MLN_WITH_VULKAN", with_vulkan); cfg.define_bool("MLN_WITH_WERROR", false); cfg } diff --git a/platform/rust/src/lib.rs b/platform/rust/src/lib.rs index d8694e8d505..47f2c92ee70 100644 --- a/platform/rust/src/lib.rs +++ b/platform/rust/src/lib.rs @@ -1,7 +1,7 @@ mod map_renderer; mod tile_server_options; -pub use map_renderer::{ImageRenderer, ImageRendererOptions, Static, Tile, Image}; +pub use map_renderer::{Image, ImageRenderer, ImageRendererOptions, Static, Tile}; pub use tile_server_options::TileServerOptions; #[cxx::bridge(namespace = "ml::bridge")] diff --git a/platform/rust/src/map_renderer.rs b/platform/rust/src/map_renderer.rs index b7fe8dc0c11..5a4e2df0a3e 100644 --- a/platform/rust/src/map_renderer.rs +++ b/platform/rust/src/map_renderer.rs @@ -1,5 +1,5 @@ -use std::marker::PhantomData; use cxx::{CxxVector, UniquePtr}; +use std::marker::PhantomData; use crate::ffi; use crate::ffi::MapRenderer_setSize; @@ -33,7 +33,7 @@ pub struct ImageRenderer(UniquePtr, PhantomData) impl ImageRenderer { /// Private constructor. - fn new(_pixel_ratio: f32/*, mode: Mode*/) -> Self { + fn new(_pixel_ratio: f32 /*, mode: Mode*/) -> Self { let map = ffi::MapRenderer_new(); // map.set_pixel_ratio(self.pixel_ratio); // map.set_mode(self.mode); @@ -44,7 +44,7 @@ impl ImageRenderer { impl ImageRenderer { pub fn render_static(&mut self, width: u32, height: u32) -> Image { MapRenderer_setSize(self.0.pin_mut(), width, height); - Image(ffi::MapRenderer_render(self.0.pin_mut()) ) + Image(ffi::MapRenderer_render(self.0.pin_mut())) } } @@ -52,7 +52,7 @@ impl ImageRenderer { pub fn render_tile(&mut self, zoom: f64, x: u64, y: u64) -> Image { MapRenderer_setSize(self.0.pin_mut(), 512, 512); // TODO: set tile location - Image(ffi::MapRenderer_render(self.0.pin_mut()) ) + Image(ffi::MapRenderer_render(self.0.pin_mut())) } }