wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 01:11:15 +02:00
Code Activity

Merge branch 'libarchive' of https://github.com/yorickvP/nix

Browse source
This commit is contained in:
Eelco Dolstra 2019-12-19 14:47:18 +01:00
commit ee235e764c
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
17 changed files with 128 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,15 +19,4 @@ std::ostream & operator << (std::ostream & str, const String & s)
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();
}
}
}