From a364a214e2982af9f351714a08c0ee7d8991932f Mon Sep 17 00:00:00 2001 From: jugeeya Date: Tue, 17 Jan 2023 17:23:24 -0800 Subject: [PATCH] Fix for recent rust-analyzer checkOnSave change; clippy fix --- .vscode/settings.json | 2 +- src/common/menu.rs | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 9eeec457..6a9e639c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,5 @@ { - "rust-analyzer.checkOnSave.overrideCommand": [ + "rust-analyzer.check.overrideCommand": [ "cargo", "+nightly", "clippy", diff --git a/src/common/menu.rs b/src/common/menu.rs index 199fc642..15b2d0ba 100644 --- a/src/common/menu.rs +++ b/src/common/menu.rs @@ -292,7 +292,7 @@ pub unsafe fn quick_menu_loop() { continue; } - let mut app = &mut *QUICK_MENU_APP.data_ptr(); + let app = &mut *QUICK_MENU_APP.data_ptr(); button_presses.a.read_press().then(|| { app.on_a(); received_input = true; @@ -337,11 +337,10 @@ pub unsafe fn quick_menu_loop() { if received_input { terminal - .draw(|f| json_response = training_mod_tui::ui(f, &mut app)) + .draw(|f| json_response = training_mod_tui::ui(f, app)) .unwrap(); received_input = false; } - drop(app); } } }