puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Move some code

Browse source
This commit is contained in:
Eelco Dolstra 2019-12-13 19:10:39 +01:00
parent b4edc3ca61
commit ac9cc2ec08
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libutil/rust-ffi.cc
View file

@ -19,4 +19,15 @@ std::ostream & operator << (std::ostream & str, const String & s)
return str; return str;
} }
size_t Source::sourceWrapper(void * _this, rust::Slice<uint8_t> data)
{
try {
// FIXME: how to propagate exceptions?
auto n = ((nix::Source *) _this)->read((unsigned char *) data.ptr, data.size);
return n;
} catch (...) {
abort();
}
}
} }

7
src/libutil/rust-ffi.hh
View file

@ -140,12 +140,7 @@ struct Source
: fun(sourceWrapper), _this(&_this) : fun(sourceWrapper), _this(&_this)
{} {}
// FIXME: how to propagate exceptions? static size_t sourceWrapper(void * _this, rust::Slice<uint8_t> data);
static size_t sourceWrapper(void * _this, rust::Slice<uint8_t> data)
{
auto n = ((nix::Source *) _this)->read((unsigned char *) data.ptr, data.size);
return n;
}
}; };
/* C++ representation of Rust's Result<T, CppException>. */ /* C++ representation of Rust's Result<T, CppException>. */