Skip to content

Commit 0ffb0fe

Browse files
committed
update rust edition
1 parent ddab6e3 commit 0ffb0fe

2 files changed

Lines changed: 10 additions & 12 deletions

File tree

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "sailor"
33
version = "0.1.0"
44
authors = ["Noah Hüsser <yatekii@yatekii.ch>"]
5-
edition = "2018"
5+
edition = "2024"
66
resolver = "2"
77

88
description = "A sailing navigation application."

src/bin/drawing/painter.rs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use std::num::NonZeroU64;
22
use std::path::Path;
3-
use std::sync::mpsc::{channel, Receiver, TryRecvError};
43
use std::sync::Arc;
4+
use std::sync::mpsc::{Receiver, TryRecvError, channel};
55

66
use glyphon::{Cache, FontSystem, Resolution, SwashCache, TextAtlas, TextRenderer, Viewport};
77
use nalgebra_glm::{vec2, vec4};
8-
use notify::{event::ModifyKind, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
8+
use notify::{EventKind, RecommendedWatcher, RecursiveMode, Watcher, event::ModifyKind};
99
use osm::config::{MAX_FEATURES, MAX_TILES};
1010
use osm::drawing::as_byte_slice;
1111
use 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

Comments
 (0)