Update rust_fst version to 0.3, adapt wrapper to new APIs (fixes #6)

Author: jbaiter

fstwrapper/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "fst-wrapper"
-version = "0.1.2"
+version = "0.3.0"
 authors = ["Johannes Baiter <johannes.baiter@gmail.com>"]
 
 [lib]
@@ -10,4 +10,6 @@ crate-type = ["dylib"]
 
 [dependencies]
 libc = "0.2"
-fst = "^0.1.30"
+fst = "^0.3.0"
+fst-levenshtein = "^0.2.0"
+fst-regex = "^0.2.0"

fstwrapper/src/map.rs

@@ -1,10 +1,13 @@
 extern crate libc;
+extern crate fst;
+extern crate fst_levenshtein;
+extern crate fst_regex;
 
 use std::error::Error;
 use std::fs::File;
 use std::io;
 use std::ptr;
-use fst::{IntoStreamer, Streamer, Levenshtein, Regex, Map, MapBuilder};
+use fst::{IntoStreamer, Streamer, Map, MapBuilder};
 use fst::map;
 use fst::raw;
 
@@ -31,8 +34,8 @@ pub struct MapOpItem {
 
 pub type FileMapBuilder = MapBuilder<&'static mut io::BufWriter<File>>;
 pub type MemMapBuilder = MapBuilder<Vec<u8>>;
-pub type MapLevStream = map::Stream<'static, &'static Levenshtein>;
-pub type MapRegexStream = map::Stream<'static, &'static Regex>;
+pub type MapLevStream = map::Stream<'static, &'static fst_levenshtein::Levenshtein>;
+pub type MapRegexStream = map::Stream<'static, &'static fst_regex::Regex>;
 
 
 #[no_mangle]
@@ -87,7 +90,8 @@ pub extern "C" fn fst_memmapbuilder_finish(ctx: *mut Context, ptr: *mut MemMapBu
 }
 
 #[no_mangle]
-pub extern "C" fn fst_map_open(ctx: *mut Context, path: *mut libc::c_char) -> *mut Map {
+#[allow(unused_unsafe)]
+pub unsafe extern "C" fn fst_map_open(ctx: *mut Context, path: *mut libc::c_char) -> *mut Map {
     let path = cstr_to_str(path);
     let map = with_context!(ctx, ptr::null_mut(), Map::from_path(path));
     to_raw_ptr(map)
@@ -163,7 +167,7 @@ pub extern "C" fn fst_mapvalues_next(ctx: *mut Context, ptr: *mut map::Values) -
 
 #[no_mangle]
 pub extern "C" fn fst_map_levsearch(map_ptr: *mut Map,
-                                    lev_ptr: *mut Levenshtein)
+                                    lev_ptr: *mut fst_levenshtein::Levenshtein)
                                     -> *mut MapLevStream {
     let map = mutref_from_ptr!(map_ptr);
     let lev = ref_from_ptr!(lev_ptr);
@@ -174,7 +178,7 @@ map_make_next_fn!(fst_map_levstream_next, *mut MapLevStream);
 
 
 #[no_mangle]
-pub extern "C" fn fst_map_regexsearch(map_ptr: *mut Map, regex_ptr: *mut Regex)
+pub extern "C" fn fst_map_regexsearch(map_ptr: *mut Map, regex_ptr: *mut fst_regex::Regex)
                                       -> *mut MapRegexStream {
     let map = mutref_from_ptr!(map_ptr);
     let regex = ref_from_ptr!(regex_ptr);

fstwrapper/src/set.rs

@@ -1,21 +1,23 @@
 extern crate libc;
 extern crate fst;
+extern crate fst_levenshtein;
+extern crate fst_regex;
 
 
 use std::error::Error;
 use std::fs::File;
 use std::io;
 use std::ptr;
-use fst::{IntoStreamer, Streamer, Levenshtein, Regex, Set, SetBuilder};
+use fst::{IntoStreamer, Streamer, Set, SetBuilder};
 use fst::set;
 
 use util::{Context, cstr_to_str, to_raw_ptr};
 
 
 pub type FileSetBuilder = SetBuilder<&'static mut io::BufWriter<File>>;
 pub type MemSetBuilder = SetBuilder<Vec<u8>>;
-pub type SetLevStream = set::Stream<'static, &'static Levenshtein>;
-pub type SetRegexStream = set::Stream<'static, &'static Regex>;
+pub type SetLevStream = set::Stream<'static, &'static fst_levenshtein::Levenshtein>;
+pub type SetRegexStream = set::Stream<'static, &'static fst_regex::Regex>;
 
 
 #[no_mangle]
@@ -67,7 +69,8 @@ pub extern "C" fn fst_memsetbuilder_finish(ctx: *mut Context, ptr: *mut MemSetBu
 }
 
 #[no_mangle]
-pub extern "C" fn fst_set_open(ctx: *mut Context, cpath: *mut libc::c_char) -> *mut Set {
+#[allow(unused_unsafe)]
+pub unsafe extern "C" fn fst_set_open(ctx: *mut Context, cpath: *mut libc::c_char) -> *mut Set {
     let path = cstr_to_str(cpath);
     let set = with_context!(ctx, ptr::null_mut(), Set::from_path(path));
     to_raw_ptr(set)
@@ -118,7 +121,7 @@ pub extern "C" fn fst_set_issuperset(self_ptr: *mut Set, oth_ptr: *mut Set) -> b
 
 #[no_mangle]
 pub extern "C" fn fst_set_levsearch(set_ptr: *mut Set,
-                                    lev_ptr: *mut Levenshtein)
+                                    lev_ptr: *mut fst_levenshtein::Levenshtein)
                                     -> *mut SetLevStream {
     let set = mutref_from_ptr!(set_ptr);
     let lev = ref_from_ptr!(lev_ptr);
@@ -128,7 +131,7 @@ make_free_fn!(fst_set_levstream_free, *mut SetLevStream);
 set_make_next_fn!(fst_set_levstream_next, *mut SetLevStream);
 
 #[no_mangle]
-pub extern "C" fn fst_set_regexsearch(set_ptr: *mut Set, regex_ptr: *mut Regex)
+pub extern "C" fn fst_set_regexsearch(set_ptr: *mut Set, regex_ptr: *mut fst_regex::Regex)
                                       -> *mut SetRegexStream {
     let set = mutref_from_ptr!(set_ptr);
     let regex = ref_from_ptr!(regex_ptr);

fstwrapper/src/util.rs

@@ -1,4 +1,6 @@
 extern crate libc;
+extern crate fst_levenshtein;
+extern crate fst_regex;
 
 
 use std::error::Error;
@@ -7,7 +9,6 @@ use std::fs::File;
 use std::intrinsics;
 use std::io;
 use std::ptr;
-use fst::{Levenshtein,Regex};
 
 
 /// Exposes information about errors over the ABI
@@ -89,18 +90,18 @@ make_free_fn!(fst_bufwriter_free, *mut io::BufWriter<File>);
 pub extern "C" fn fst_levenshtein_new(ctx: *mut Context,
                                       c_key: *mut libc::c_char,
                                       max_dist: libc::uint32_t)
-                                      -> *mut Levenshtein {
+                                      -> *mut fst_levenshtein::Levenshtein {
     let key = cstr_to_str(c_key);
     let lev = with_context!(ctx, ptr::null_mut(),
-                            Levenshtein::new(key, max_dist));
+                            fst_levenshtein::Levenshtein::new(key, max_dist));
     to_raw_ptr(lev)
 }
-make_free_fn!(fst_levenshtein_free, *mut Levenshtein);
+make_free_fn!(fst_levenshtein_free, *mut fst_levenshtein::Levenshtein);
 
 #[no_mangle]
-pub extern "C" fn fst_regex_new(ctx: *mut Context, c_pat: *mut libc::c_char) -> *mut Regex {
+pub extern "C" fn fst_regex_new(ctx: *mut Context, c_pat: *mut libc::c_char) -> *mut fst_regex::Regex {
     let pat = cstr_to_str(c_pat);
-    let re = with_context!(ctx, ptr::null_mut(), Regex::new(pat));
+    let re = with_context!(ctx, ptr::null_mut(), fst_regex::Regex::new(pat));
     to_raw_ptr(re)
 }
-make_free_fn!(fst_regex_free, *mut Regex);
+make_free_fn!(fst_regex_free, *mut fst_regex::Regex);

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='rust-fst',
-    version='0.1.2',
+    version='0.2.0dev',
     author='Johannes Baiter',
     author_email='johannes.baiter@gmail.com',
     description=('Python bindings for the Rust `fst` create, providing sets '