This version compiles successfully; will test calling from Python later.

Author: davidblewett

fstwrapper/src/set.rs

@@ -147,9 +147,8 @@ pub extern "C" fn fst_set_make_opbuilder(ptr: *mut Set) -> *mut set::OpBuilder<'
 make_free_fn!(fst_set_opbuilder_free, *mut set::OpBuilder);
 
 #[no_mangle]
-pub extern "C" fn fst_set_make_opstreambuilder(ptr: *mut &set::Stream) -> *mut set::OpBuilder<'static> {
-    let stream = unsafe { *Box::from_raw(ptr) };
-    let ob = set::OpBuilder::new().add(stream);
+pub extern "C" fn fst_set_make_opstreambuilder() -> *mut set::OpBuilder<'static> {
+    let ob = set::OpBuilder::new();
     to_raw_ptr(ob)
 }
 make_free_fn!(fst_set_opstreambuilder_free, *mut set::OpBuilder);
@@ -162,9 +161,9 @@ pub extern "C" fn fst_set_opbuilder_push(ptr: *mut set::OpBuilder, set_ptr: *mut
 }
 
 #[no_mangle]
-pub extern "C" fn fst_set_opbuilder_push_stream(ptr: *mut set::OpBuilder, stream_ptr: *mut &set::Stream) {
-    let stream = unsafe { *Box::from_raw(stream_ptr) };
+pub extern "C" fn fst_set_opbuilder_push_stream(ptr: *mut set::OpBuilder<'static>, stream_ptr: *mut set::Stream<'static>) {
     let ob = mutref_from_ptr!(ptr);
+    let stream = unsafe { *Box::from_raw(stream_ptr) };
     ob.push(stream);
 }
 

rust_fst/set.py

@@ -61,7 +61,8 @@ def __init__(self, ptr, as_stream=False):
         #       once we call union/intersection/difference
         self.as_stream = as_stream
         if self.as_stream:
-            self._ptr = lib.fst_set_make_opstreambuilder(ptr)
+            self._ptr = lib.fst_set_make_opstreambuilder()
+            lib.fst_set_opbuilder_push_stream(self._ptr, ptr)
         else:
             self._ptr = lib.fst_set_make_opbuilder(ptr)