loot/loot-condition-interpreter
0
0
Fork 0
mirror of https://github.com/loot/loot-condition-interpreter.git synced 2026-07-27 14:16:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Resolve rustc deprecation warnings

Browse Source
This commit is contained in:
Oliver Hamlet
2020-04-02 08:55:29 +01:00
parent f6e988b1af
commit e31456f5b9
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ffi/src/lib.rs
+1 -2
View File
@@ -6,7 +6,6 @@ mod helpers;
mod state;
use std::cell::RefCell;
use std::error::Error;
use std::ffi::CString;
use std::panic::catch_unwind;
use std::ptr;
@@ -62,7 +61,7 @@ pub unsafe extern "C" fn lci_condition_eval(
};
let state = match (*state).0.read() {
Err(e) => return error(LCI_ERROR_POISONED_THREAD_LOCK, e.description()),
Err(e) => return error(LCI_ERROR_POISONED_THREAD_LOCK, &e.to_string()),
Ok(s) => s,
};
ffi/src/state.rs
+6 -7
View File
@@ -1,4 +1,3 @@
use std::error::Error;
use std::panic::catch_unwind;
use std::path::PathBuf;
use std::sync::RwLock;
@@ -100,7 +99,7 @@ pub unsafe extern "C" fn lci_state_set_active_plugins(
};
let mut state = match (*state).0.write() {
Err(e) => return error(LCI_ERROR_POISONED_THREAD_LOCK, e.description()),
Err(e) => return error(LCI_ERROR_POISONED_THREAD_LOCK, &e.to_string()),
Ok(h) => h,
};
@@ -138,7 +137,7 @@ pub unsafe extern "C" fn lci_state_set_plugin_versions(
};
let mut state = match (*state).0.write() {
Err(e) => return error(LCI_ERROR_POISONED_THREAD_LOCK, e.description()),
Err(e) => return error(LCI_ERROR_POISONED_THREAD_LOCK, &e.to_string()),
Ok(h) => h,
};
@@ -176,9 +175,9 @@ pub unsafe extern "C" fn lci_state_set_crc_cache(
};
match (*state).0.write() {
Err(e) => error(LCI_ERROR_POISONED_THREAD_LOCK, e.description()),
Err(e) => error(LCI_ERROR_POISONED_THREAD_LOCK, &e.to_string()),
Ok(mut s) => match s.set_cached_crcs(&plugin_crcs) {
Err(e) => error(LCI_ERROR_POISONED_THREAD_LOCK, e.description()),
Err(e) => error(LCI_ERROR_POISONED_THREAD_LOCK, &e.to_string()),
Ok(_) => LCI_OK,
},
}
@@ -194,9 +193,9 @@ pub unsafe extern "C" fn lci_state_clear_condition_cache(state: *mut lci_state)
error(LCI_ERROR_INVALID_ARGS, "Null state pointer passed")
} else {
match (*state).0.write() {
Err(e) => error(LCI_ERROR_POISONED_THREAD_LOCK, e.description()),
Err(e) => error(LCI_ERROR_POISONED_THREAD_LOCK, &e.to_string()),
Ok(mut s) => match s.clear_condition_cache() {
Err(e) => error(LCI_ERROR_POISONED_THREAD_LOCK, e.description()),
Err(e) => error(LCI_ERROR_POISONED_THREAD_LOCK, &e.to_string()),
Ok(_) => LCI_OK,
},
}