X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-c-bindings;a=blobdiff_plain;f=lightning-c-bindings%2Fsrc%2Flightning_persister%2Ffs_store.rs;fp=lightning-c-bindings%2Fsrc%2Flightning_persister%2Ffs_store.rs;h=073d9d91a6dac03f5e2a0c820a0ddd3039896e35;hp=a53f6e6046f65beb43980035a97ca3b0c76a0276;hb=5502fccd64611f16f5ebba3759c68b1a4d69b537;hpb=1ec49fac7433e5b8693c3858a3e25998bc888eeb diff --git a/lightning-c-bindings/src/lightning_persister/fs_store.rs b/lightning-c-bindings/src/lightning_persister/fs_store.rs index a53f6e6..073d9d9 100644 --- a/lightning-c-bindings/src/lightning_persister/fs_store.rs +++ b/lightning-c-bindings/src/lightning_persister/fs_store.rs @@ -86,10 +86,10 @@ pub extern "C" fn FilesystemStore_get_data_dir(this_arg: &crate::lightning_persi impl From for crate::lightning::util::persist::KVStore { fn from(obj: nativeFilesystemStore) -> Self { - let mut rust_obj = FilesystemStore { inner: ObjOps::heap_alloc(obj), is_owned: true }; + let rust_obj = crate::lightning_persister::fs_store::FilesystemStore { inner: ObjOps::heap_alloc(obj), is_owned: true }; let mut ret = FilesystemStore_as_KVStore(&rust_obj); - // We want to free rust_obj when ret gets drop()'d, not rust_obj, so wipe rust_obj's pointer and set ret's free() fn - rust_obj.inner = core::ptr::null_mut(); + // We want to free rust_obj when ret gets drop()'d, not rust_obj, so forget it and set ret's free() fn + core::mem::forget(rust_obj); ret.free = Some(FilesystemStore_free_void); ret }