Fix clippy needless_borrow and unused_mut
This commit is contained in:
parent
669e37ac5c
commit
c3edf715ef
10
src/main.rs
10
src/main.rs
|
@ -540,9 +540,9 @@ fn main2() {
|
||||||
fn tick_all(
|
fn tick_all(
|
||||||
window: &winit::window::Window,
|
window: &winit::window::Window,
|
||||||
game: &mut Game,
|
game: &mut Game,
|
||||||
mut ui_container: &mut ui::Container,
|
ui_container: &mut ui::Container,
|
||||||
last_frame: &mut Instant,
|
last_frame: &mut Instant,
|
||||||
mut resui: &mut resources::ManagerUI,
|
resui: &mut resources::ManagerUI,
|
||||||
last_resource_version: &mut usize,
|
last_resource_version: &mut usize,
|
||||||
vsync: &mut bool,
|
vsync: &mut bool,
|
||||||
) {
|
) {
|
||||||
|
@ -558,7 +558,7 @@ fn tick_all(
|
||||||
let version = {
|
let version = {
|
||||||
let try_res = game.resource_manager.try_write();
|
let try_res = game.resource_manager.try_write();
|
||||||
if let Ok(mut res) = try_res {
|
if let Ok(mut res) = try_res {
|
||||||
res.tick(&mut resui, &mut ui_container, delta);
|
res.tick(resui, ui_container, delta);
|
||||||
res.version()
|
res.version()
|
||||||
} else {
|
} else {
|
||||||
// TODO: why does game.resource_manager.write() sometimes deadlock?
|
// TODO: why does game.resource_manager.write() sometimes deadlock?
|
||||||
|
@ -591,7 +591,7 @@ fn tick_all(
|
||||||
.tick(&mut game.server.world, &mut game.renderer, version);
|
.tick(&mut game.server.world, &mut game.renderer, version);
|
||||||
|
|
||||||
game.screen_sys
|
game.screen_sys
|
||||||
.tick(delta, &mut game.renderer, &mut ui_container);
|
.tick(delta, &mut game.renderer, ui_container);
|
||||||
/* TODO: open console for chat messages
|
/* TODO: open console for chat messages
|
||||||
if let Some(received_chat_at) = game.server.received_chat_at {
|
if let Some(received_chat_at) = game.server.received_chat_at {
|
||||||
if Instant::now().duration_since(received_chat_at).as_secs() < 5 {
|
if Instant::now().duration_since(received_chat_at).as_secs() < 5 {
|
||||||
|
@ -603,7 +603,7 @@ fn tick_all(
|
||||||
game.console
|
game.console
|
||||||
.lock()
|
.lock()
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.tick(&mut ui_container, &game.renderer, delta, width);
|
.tick(ui_container, &game.renderer, delta, width);
|
||||||
ui_container.tick(&mut game.renderer, delta, width, height);
|
ui_container.tick(&mut game.renderer, delta, width, height);
|
||||||
game.renderer.tick(
|
game.renderer.tick(
|
||||||
&mut game.server.world,
|
&mut game.server.world,
|
||||||
|
|
Loading…
Reference in New Issue