kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename into_ into extract_

Browse Source
This commit is contained in:
Julien Cretin
2020-11-11 10:28:32 +01:00
parent 833f195d88
commit d5a43c346f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/persistent_store/src/driver.rs
View File

@@ -278,7 +278,7 @@ impl StoreDriverOff {
}; };
StoreDriver::On(StoreDriverOn::new(store, self.model, &[]).map_err( StoreDriver::On(StoreDriverOn::new(store, self.model, &[]).map_err(
|(rollback, store)| { |(rollback, store)| {
let storage = store.into_storage(); let storage = store.extract_storage();
match error { match error {
None => (storage, rollback), None => (storage, rollback),
Some(complete) => { Some(complete) => {
@@ -336,7 +336,7 @@ impl StoreDriverOn {
} }
/// Extracts the store. /// Extracts the store.
pub fn into_store(self) -> Store<BufferStorage> { pub fn extract_store(self) -> Store<BufferStorage> {
self.store self.store
} }
@@ -397,7 +397,7 @@ impl StoreDriverOn {
} }
Err(StoreError::StorageError) => { Err(StoreError::StorageError) => {
let mut driver = StoreDriverOff { let mut driver = StoreDriverOff {
storage: self.store.into_storage(), storage: self.store.extract_storage(),
model: self.model, model: self.model,
complete: None, complete: None,
}; };
@@ -428,7 +428,7 @@ impl StoreDriverOn {
store.storage_mut().arm_interruption(delay); store.storage_mut().arm_interruption(delay);
match store.apply(operation).1 { match store.apply(operation).1 {
Err(StoreError::StorageError) => (), Err(StoreError::StorageError) => (),
Err(StoreError::InvalidStorage) => return Err((delay, store.into_storage())), Err(StoreError::InvalidStorage) => return Err((delay, store.extract_storage())),
Ok(()) | Err(_) => break, Ok(()) | Err(_) => break,
} }
result.push(count_modified_bits(store.storage_mut())); result.push(count_modified_bits(store.storage_mut()));
@@ -440,7 +440,7 @@ impl StoreDriverOn {
/// Powers off the store. /// Powers off the store.
pub fn power_off(self) -> StoreDriverOff { pub fn power_off(self) -> StoreDriverOff {
StoreDriverOff { StoreDriverOff {
storage: self.store.into_storage(), storage: self.store.extract_storage(),
model: self.model, model: self.model,
complete: None, complete: None,
} }

2
libraries/persistent_store/src/store.rs
View File

@@ -1052,7 +1052,7 @@ impl Store<BufferStorage> {
} }
/// Extracts the storage. /// Extracts the storage.
pub fn into_storage(self) -> BufferStorage { pub fn extract_storage(self) -> BufferStorage {
self.storage self.storage
} }