Remove use of 'as' keyword

It was used for an unnecessary pointer cast, and a enum value
cast (which needed tests to make sure those values didn't change over
time).
This commit is contained in:
Oliver Hamlet
2022-09-15 22:06:35 +01:00
parent 33cb1a0aff
commit 6164c6b8e6
2 changed files with 10 additions and 29 deletions
+9 -28
View File
@@ -1,5 +1,4 @@
use libc::c_int;
use loot_condition_interpreter::GameType;
#[no_mangle]
pub static LCI_OK: c_int = 0;
@@ -40,54 +39,36 @@ pub static LCI_ERROR_TEXT_ENCODE_FAIL: c_int = -7;
/// Game code for The Elder Scrolls III: Morrowind.
#[no_mangle]
pub static LCI_GAME_MORROWIND: c_int = GameType::Morrowind as c_int;
pub static LCI_GAME_MORROWIND: c_int = 8;
/// Game code for The Elder Scrolls IV: Oblivion.
#[no_mangle]
pub static LCI_GAME_OBLIVION: c_int = GameType::Oblivion as c_int;
pub static LCI_GAME_OBLIVION: c_int = 0;
/// Game code for The Elder Scrolls V: Skyrim.
#[no_mangle]
pub static LCI_GAME_SKYRIM: c_int = GameType::Skyrim as c_int;
pub static LCI_GAME_SKYRIM: c_int = 1;
/// Game code for Fallout 3.
#[no_mangle]
pub static LCI_GAME_FALLOUT_3: c_int = GameType::Fallout3 as c_int;
pub static LCI_GAME_FALLOUT_3: c_int = 4;
/// Game code for Fallout: New Vegas.
#[no_mangle]
pub static LCI_GAME_FALLOUT_NV: c_int = GameType::FalloutNV as c_int;
pub static LCI_GAME_FALLOUT_NV: c_int = 5;
/// Game code for Fallout 4.
#[no_mangle]
pub static LCI_GAME_FALLOUT_4: c_int = GameType::Fallout4 as c_int;
pub static LCI_GAME_FALLOUT_4: c_int = 6;
/// Game code for The Elder Scrolls V: Skyrim Special Edition.
#[no_mangle]
pub static LCI_GAME_SKYRIM_SE: c_int = GameType::SkyrimSE as c_int;
pub static LCI_GAME_SKYRIM_SE: c_int = 2;
/// Game code for The Elder Scrolls V: Skyrim VR.
#[no_mangle]
pub static LCI_GAME_SKYRIM_VR: c_int = GameType::SkyrimVR as c_int;
pub static LCI_GAME_SKYRIM_VR: c_int = 3;
/// Game code for Fallout 4 VR.
#[no_mangle]
pub static LCI_GAME_FALLOUT_4_VR: c_int = GameType::Fallout4VR as c_int;
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn game_constants_should_have_expected_integer_values() {
assert_eq!(8, LCI_GAME_MORROWIND);
assert_eq!(0, LCI_GAME_OBLIVION);
assert_eq!(1, LCI_GAME_SKYRIM);
assert_eq!(2, LCI_GAME_SKYRIM_SE);
assert_eq!(3, LCI_GAME_SKYRIM_VR);
assert_eq!(4, LCI_GAME_FALLOUT_3);
assert_eq!(5, LCI_GAME_FALLOUT_NV);
assert_eq!(6, LCI_GAME_FALLOUT_4);
assert_eq!(7, LCI_GAME_FALLOUT_4_VR);
}
}
pub static LCI_GAME_FALLOUT_4_VR: c_int = 7;
+1 -1
View File
@@ -85,7 +85,7 @@ pub unsafe extern "C" fn lci_get_error_message(message: *mut *const c_char) -> c
if f.borrow().as_bytes().is_empty() {
*message = ptr::null();
} else {
*message = f.borrow().as_ptr() as *const i8;
*message = f.borrow().as_ptr();
}
});