Put the ffi in it's own module (for namespace control)

src/rust-base/cbindgen.toml

@@ -2,7 +2,7 @@ language = "C"
 
 [export.rename]
 
-"FooterType" = "footer"
+"Footer" = "footer"
 
 [enum]
 rename_variants = "QualifiedScreamingSnakeCase"

src/rust-base/src/lib.rs

@@ -38,7 +38,6 @@ pub struct StatChange {
     addend: i32,
 }
 
-
 peg::parser! {
     grammar storybook_parser() for str {
         pub rule story() -> Vec<Page>
@@ -168,17 +167,27 @@ impl From<Vec<Page>> for Book {
 
 // C API
 
+pub mod ffi {
     use std::ffi::CStr;
     use std::ffi::CString;
     use std::os::raw::c_char;
 
+    use super::Book;
+
+    #[repr(C)]
+    pub enum Footer {
+        Ending,
+        Goto,
+        Choices,
+    }
+
     #[no_mangle]
     pub extern fn storybook_make_book(string: *const c_char) -> *mut Book {
         let string = unsafe {
             CStr::from_ptr(string)
         };
         let string = string.to_str().expect("Error, input string not valid UTF-8");
-    let pages = storybook_parser::story(string).expect("Error, input string could not be parsed");
+        let pages = super::storybook_parser::story(string).expect("Error, input string could not be parsed");
         let book = Book::from(pages);
         let book = Box::from(book);
         Box::into_raw(book)
@@ -213,20 +222,13 @@ pub extern fn storybook_get_body(book: *mut Book) -> *mut c_char {
         body.into_raw()
     }
 
-#[repr(C)]
-pub enum FooterType {
-    Ending,
-    Goto,
-    Choices,
-}
-
     #[no_mangle]
-pub extern fn storybook_get_footer(book: *mut Book) -> FooterType {
+    pub extern fn storybook_get_footer(book: *mut Book) -> Footer {
         let book = get_book_from_ref(book);
         match book.get_current().footer {
-        Footer::Ending => FooterType::Ending,
-        Footer::Goto(_) => FooterType::Goto,
-        Footer::Choices(_) => FooterType::Choices,
+            super::Footer::Ending => Footer::Ending,
+            super::Footer::Goto(_) => Footer::Goto,
+            super::Footer::Choices(_) => Footer::Choices,
         }
     }
 
@@ -247,6 +249,7 @@ pub extern fn storybook_advance_option(book: *mut Book, option: u32) {
         let book = get_book_from_ref(book);
         book.advance_option(option);
     }
+}
 
 #[cfg(test)]
 mod tests {