11use std:: num:: NonZeroU64 ;
22use std:: path:: Path ;
3- use std:: sync:: mpsc:: { channel, Receiver , TryRecvError } ;
43use std:: sync:: Arc ;
4+ use std:: sync:: mpsc:: { Receiver , TryRecvError , channel} ;
55
66use glyphon:: { Cache , FontSystem , Resolution , SwashCache , TextAtlas , TextRenderer , Viewport } ;
77use nalgebra_glm:: { vec2, vec4} ;
8- use notify:: { event :: ModifyKind , EventKind , RecommendedWatcher , RecursiveMode , Watcher } ;
8+ use notify:: { EventKind , RecommendedWatcher , RecursiveMode , Watcher , event :: ModifyKind } ;
99use osm:: config:: { MAX_FEATURES , MAX_TILES } ;
1010use osm:: drawing:: as_byte_slice;
1111use osm:: drawing:: vertex:: Vertex ;
@@ -427,12 +427,12 @@ impl Painter {
427427
428428 fn create_uniform_buffer ( device : & Device ) -> Buffer {
429429 let data = [ 0 ; UNIFORM_BUFFER_SIZE as usize ] ;
430- let buffer = device. create_buffer_init ( & wgpu:: util:: BufferInitDescriptor {
430+
431+ device. create_buffer_init ( & wgpu:: util:: BufferInitDescriptor {
431432 label : Some ( "tile data" ) ,
432433 contents : as_byte_slice ( & data) ,
433434 usage : BufferUsages :: UNIFORM | BufferUsages :: COPY_DST ,
434- } ) ;
435- buffer
435+ } )
436436 }
437437
438438 /// Creates a new transform buffer from the tile transforms.
@@ -465,12 +465,11 @@ impl Painter {
465465 }
466466 (
467467 {
468- let buffer = device. create_buffer_init ( & BufferInitDescriptor {
468+ device. create_buffer_init ( & BufferInitDescriptor {
469469 label : Some ( "tile transforms buffer" ) ,
470470 contents : as_byte_slice ( data. as_slice ( ) ) ,
471471 usage : BufferUsages :: UNIFORM | BufferUsages :: COPY_DST ,
472- } ) ;
473- buffer
472+ } )
474473 } ,
475474 TILE_DATA_BUFFER_BYTE_SIZE as u64 ,
476475 )
@@ -488,12 +487,11 @@ impl Painter {
488487 pub selected_object_id : u32 ,
489488 }
490489
491- let buffer = device. create_buffer_init ( & BufferInitDescriptor {
490+ device. create_buffer_init ( & BufferInitDescriptor {
492491 label : Some ( "tile selection buffer" ) ,
493492 contents : as_byte_slice ( & [ selected_tile_id, selected_object_id] ) ,
494493 usage : BufferUsages :: UNIFORM | BufferUsages :: COPY_DST ,
495- } ) ;
496- buffer
494+ } )
497495 }
498496
499497 fn copy_uniform_buffers (
0 commit comments