Run clippy

This commit is contained in:
Maximilian Ammann 2022-03-15 14:59:46 +01:00
parent 22951fdc0e
commit a937473b35
5 changed files with 7 additions and 9 deletions

View File

@ -1,6 +1,6 @@
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use log::{info, warn}; use log::{info};
use std::sync::mpsc::{channel, Receiver, SendError, Sender}; use std::sync::mpsc::{channel, Receiver, SendError, Sender};
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
@ -75,7 +75,7 @@ impl ThreadLocalTessellatorState {
request_id: TileRequestID, request_id: TileRequestID,
data: Box<[u8]>, data: Box<[u8]>,
) -> Result<(), SendError<TileTessellateResult>> { ) -> Result<(), SendError<TileTessellateResult>> {
if let Ok(mut tile_request_state) = self.tile_request_state.lock() { if let Ok(tile_request_state) = self.tile_request_state.lock() {
if let Some(tile_request) = tile_request_state.get_tile_request(request_id) { if let Some(tile_request) = tile_request_state.get_tile_request(request_id) {
self.tessellate_layers_with_request( self.tessellate_layers_with_request(
TileFetchResult::Tile { TileFetchResult::Tile {

View File

@ -1,7 +1,7 @@
use crate::coords::WorldTileCoords; use crate::coords::WorldTileCoords;
use crate::io::LayerResult; use crate::io::LayerResult;
use std::collections::{btree_map, BTreeMap, HashSet}; use std::collections::{btree_map, BTreeMap, HashSet};
use std::sync::{Arc, Mutex};
pub struct TileCache { pub struct TileCache {
index: BTreeMap<WorldTileCoords, Vec<LayerResult>>, index: BTreeMap<WorldTileCoords, Vec<LayerResult>>,

View File

@ -3,7 +3,7 @@
//! * Platform Events like suspend/resume //! * Platform Events like suspend/resume
//! * Render a new frame //! * Render a new frame
use log::{error, info, trace}; use log::{error, trace};
use style_spec::Style; use style_spec::Style;
use winit::event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent}; use winit::event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent};
use winit::event_loop::{ControlFlow, EventLoop}; use winit::event_loop::{ControlFlow, EventLoop};

View File

@ -512,7 +512,7 @@ mod tests {
pool.allocate_tile_geometry( pool.allocate_tile_geometry(
&queue, &queue,
(0, 0, 0).into(), (0, 0, 0).into(),
style_layer.clone(), style_layer,
&data24bytes_aligned, &data24bytes_aligned,
2, 2,
&vec![], &vec![],

View File

@ -364,9 +364,7 @@ impl RenderState {
let source_layers: HashSet<String> = self let source_layers: HashSet<String> = self
.style .style
.layers .layers
.iter() .iter().filter_map(|layer| layer.source_layer.as_ref())
.map(|layer| layer.source_layer.as_ref())
.filter_map(|x| x)
.cloned() .cloned()
.collect(); .collect();
@ -459,7 +457,7 @@ impl RenderState {
&self.queue, &self.queue,
*coords, *coords,
style_layer.clone(), style_layer.clone(),
&buffer, buffer,
ShaderTileMetadata::new(transform.into()), ShaderTileMetadata::new(transform.into()),
&feature_metadata, &feature_metadata,
); );