More fixes

Author: jbaiter

fstwrapper/src/lib.rs

@@ -3,6 +3,8 @@
 
 extern crate libc;
 extern crate fst;
+extern crate fst_regex;
+extern crate fst_levenshtein;
 
 
 /// Get an immutable reference from a raw pointer

fstwrapper/src/map.rs

@@ -1,7 +1,4 @@
 extern crate libc;
-extern crate fst;
-extern crate fst_levenshtein;
-extern crate fst_regex;
 
 use std::error::Error;
 use std::fs::File;
@@ -10,6 +7,8 @@ use std::ptr;
 use fst::{IntoStreamer, Streamer, Map, MapBuilder};
 use fst::map;
 use fst::raw;
+use fst_levenshtein::Levenshtein;
+use fst_regex::Regex;
 
 use util::{Context, str_to_cstr, cstr_to_str, to_raw_ptr};
 
@@ -34,8 +33,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 fst_levenshtein::Levenshtein>;
-pub type MapRegexStream = map::Stream<'static, &'static fst_regex::Regex>;
+pub type MapLevStream = map::Stream<'static, &'static Levenshtein>;
+pub type MapRegexStream = map::Stream<'static, &'static Regex>;
 
 
 #[no_mangle]
@@ -167,7 +166,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 fst_levenshtein::Levenshtein)
+                                    lev_ptr: *mut Levenshtein)
                                     -> *mut MapLevStream {
     let map = mutref_from_ptr!(map_ptr);
     let lev = ref_from_ptr!(lev_ptr);
@@ -178,7 +177,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 fst_regex::Regex)
+pub extern "C" fn fst_map_regexsearch(map_ptr: *mut Map, regex_ptr: *mut Regex)
                                       -> *mut MapRegexStream {
     let map = mutref_from_ptr!(map_ptr);
     let regex = ref_from_ptr!(regex_ptr);

fstwrapper/src/set.rs

@@ -1,23 +1,21 @@
 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, Set, SetBuilder};
 use fst::set;
+use fst_levenshtein::Levenshtein;
+use fst_regex::Regex;
 
 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 fst_levenshtein::Levenshtein>;
-pub type SetRegexStream = set::Stream<'static, &'static fst_regex::Regex>;
+pub type SetLevStream = set::Stream<'static, &'static Levenshtein>;
+pub type SetRegexStream = set::Stream<'static, &'static Regex>;
 
 
 #[no_mangle]
@@ -121,7 +119,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 fst_levenshtein::Levenshtein)
+                                    lev_ptr: *mut Levenshtein)
                                     -> *mut SetLevStream {
     let set = mutref_from_ptr!(set_ptr);
     let lev = ref_from_ptr!(lev_ptr);
@@ -131,7 +129,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 fst_regex::Regex)
+pub extern "C" fn fst_set_regexsearch(set_ptr: *mut Set, regex_ptr: *mut Regex)
                                       -> *mut SetRegexStream {
     let set = mutref_from_ptr!(set_ptr);
     let regex = ref_from_ptr!(regex_ptr);

fstwrapper/src/util.rs

@@ -9,9 +9,12 @@ use std::fs::File;
 use std::intrinsics;
 use std::io;
 use std::ptr;
+use fst_regex::Regex;
+use fst_levenshtein::Levenshtein;
 
 
 /// Exposes information about errors over the ABI
+#[repr(C)]
 pub struct Context {
     pub has_error: bool,
     pub error_type: *mut libc::c_char,
@@ -90,18 +93,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 fst_levenshtein::Levenshtein {
+                                      -> *mut Levenshtein {
     let key = cstr_to_str(c_key);
     let lev = with_context!(ctx, ptr::null_mut(),
-                            fst_levenshtein::Levenshtein::new(key, max_dist));
+                            Levenshtein::new(key, max_dist));
     to_raw_ptr(lev)
 }
-make_free_fn!(fst_levenshtein_free, *mut fst_levenshtein::Levenshtein);
+make_free_fn!(fst_levenshtein_free, *mut Levenshtein);
 
 #[no_mangle]
-pub extern "C" fn fst_regex_new(ctx: *mut Context, c_pat: *mut libc::c_char) -> *mut fst_regex::Regex {
+pub extern "C" fn fst_regex_new(ctx: *mut Context, c_pat: *mut libc::c_char) -> *mut Regex {
     let pat = cstr_to_str(c_pat);
-    let re = with_context!(ctx, ptr::null_mut(), fst_regex::Regex::new(pat));
+    let re = with_context!(ctx, ptr::null_mut(), Regex::new(pat));
     to_raw_ptr(re)
 }
-make_free_fn!(fst_regex_free, *mut fst_regex::Regex);
+make_free_fn!(fst_regex_free, *mut Regex);