Merge pull request #873 from matthiasbeyer/libimagstore/fix-warnings

Libimagstore/fix warnings
This commit is contained in:
Matthias Beyer 2017-01-25 19:37:07 +01:00 committed by GitHub
commit b03d1b562d

View file

@ -1814,7 +1814,7 @@ mod store_hook_tests {
impl StoreIdAccessor for TestHookAccessor { impl StoreIdAccessor for TestHookAccessor {
fn access(&self, id: &StoreId) -> HookResult<()> { fn access(&self, _: &StoreId) -> HookResult<()> {
get_result(self.succeed, self.error_aborting) get_result(self.succeed, self.error_aborting)
} }
@ -1822,7 +1822,7 @@ mod store_hook_tests {
impl MutableHookDataAccessor for TestHookAccessor { impl MutableHookDataAccessor for TestHookAccessor {
fn access_mut(&self, fle: &mut FileLockEntry) -> HookResult<()> { fn access_mut(&self, _: &mut FileLockEntry) -> HookResult<()> {
get_result(self.succeed, self.error_aborting) get_result(self.succeed, self.error_aborting)
} }
@ -1830,7 +1830,7 @@ mod store_hook_tests {
impl NonMutableHookDataAccessor for TestHookAccessor { impl NonMutableHookDataAccessor for TestHookAccessor {
fn access(&self, fle: &FileLockEntry) -> HookResult<()> { fn access(&self, _: &FileLockEntry) -> HookResult<()> {
get_result(self.succeed, self.error_aborting) get_result(self.succeed, self.error_aborting)
} }
@ -1883,7 +1883,6 @@ aspect = "test"
fn test_hook_execution(hook_positions: &[HP], storeid_name: &str) { fn test_hook_execution(hook_positions: &[HP], storeid_name: &str) {
let mut store = get_store_with_config(); let mut store = get_store_with_config();
let pos = HP::PreCreate; let pos = HP::PreCreate;
let hook = TestHook::new(pos.clone(), true, false);
println!("Registering hooks..."); println!("Registering hooks...");
for pos in hook_positions { for pos in hook_positions {
@ -2004,7 +2003,7 @@ aspect = "test"
for position in positions.iter() { for position in positions.iter() {
for n in 2..10 { for n in 2..10 {
let mut v = Vec::with_capacity(n); let mut v = Vec::with_capacity(n);
for x in 0..n { v.push(position.clone()); } for _ in 0..n { v.push(position.clone()); }
test_hook_execution(&v, "test_multiple_same_position"); test_hook_execution(&v, "test_multiple_same_position");
} }
@ -2020,10 +2019,6 @@ aspect = "test"
store store
} }
fn default_test_id() -> StoreId {
StoreId::new_baseless(PathBuf::from("test")).unwrap()
}
#[test] #[test]
fn test_pre_create_error() { fn test_pre_create_error() {
let storeid = StoreId::new_baseless(PathBuf::from("test_pre_create_error")).unwrap(); let storeid = StoreId::new_baseless(PathBuf::from("test_pre_create_error")).unwrap();