greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Projects Releases 9 Packages Wiki Activity

Exclude Xcode's build directory, not Rust's

Browse source
This commit is contained in:
Emily Toop 2018-05-14 14:19:05 +01:00
parent 0e0316991a
commit 9b23ee0855
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -55,7 +55,7 @@ pom.xml.asc
/fixtures/*.db-wal /fixtures/*.db-wal
/query-parser/out/ /query-parser/out/
## Build generated ## Build generated
build/ /sdks/swift/Mentat/build/
DerivedData DerivedData
build.xcarchive build.xcarchive

15
ffi/src/lib.rs
View file

@ -30,15 +30,12 @@
//! Pointers to values that are guaranteed to live beyond the lifetime of the function, //! Pointers to values that are guaranteed to live beyond the lifetime of the function,
//! are passed over the FFI as a raw pointer. //! are passed over the FFI as a raw pointer.
//! //!
//! ``` //! `value as *const Binding`
//! value as *const TypedValue //!
//! ```
//! Pointers to values that cannot be guaranteed to live beyond the lifetime of the function //! Pointers to values that cannot be guaranteed to live beyond the lifetime of the function
//! are first `Box`ed so that they live on the heap, and the raw pointer passed this way. //! are first `Box`ed so that they live on the heap, and the raw pointer passed this way.
//! //!
//! ``` //! `Box::into_raw(Box::new(value))`
//! Box::into_raw(Box::new(value))
//! ```
//! //!
//! The memory for a value that is moved onto the heap before being passed over the FFI //! The memory for a value that is moved onto the heap before being passed over the FFI
//! is no longer managed by Rust, but Rust still owns the value. Therefore the pointer //! is no longer managed by Rust, but Rust still owns the value. Therefore the pointer
@ -50,9 +47,7 @@
//! //!
//! A macro has been provided to make defining destructors easier. //! A macro has been provided to make defining destructors easier.
//! //!
//! ``` //! `define_destructor!(query_builder_destroy, QueryBuilder);`
//! define_destructor!(query_builder_destroy, QueryBuilder);
//! ```
//! //!
//! Passing a pointer to memory that has already been released will cause Mentat to crash, //! Passing a pointer to memory that has already been released will cause Mentat to crash,
//! so callers have to be careful to ensure they manage their pointers properly. //! so callers have to be careful to ensure they manage their pointers properly.
@ -71,7 +66,7 @@
//! native access pattern to callers and to enable easier passing of optional types and error //! native access pattern to callers and to enable easier passing of optional types and error
//! propogation. These types have implemented [From](std::convert::From) such that conversion from the Rust type //! propogation. These types have implemented [From](std::convert::From) such that conversion from the Rust type
//! to the C type is as painless as possible. //! to the C type is as painless as possible.
//!
extern crate libc; extern crate libc;
extern crate mentat; extern crate mentat;