Make the Store API more type-safe

Most functions now take a StorePath argument rather than a Path (which
is just an alias for std::string). The StorePath constructor ensures
that the path is syntactically correct (i.e. it looks like
<store-dir>/<base32-hash>-<name>). Similarly, functions like
buildPaths() now take a StorePathWithOutputs, rather than abusing Path
by adding a '!<outputs>' suffix.

Note that the StorePath type is implemented in Rust. This involves
some hackery to allow Rust values to be used directly in C++, via a
helper type whose destructor calls the Rust type's drop()
function. The main issue is the dynamic nature of C++ move semantics:
after we have moved a Rust value, we should not call the drop function
on the original value. So when we move a value, we set the original
value to bitwise zero, and the destructor only calls drop() if the
value is not bitwise zero. This should be sufficient for most types.

Also lots of minor cleanups to the C++ API to make it more modern
(e.g. using std::optional and std::string_view in some places).

nix-rust/src/c.rs

@@ -1,6 +1,7 @@
 use super::{
     error,
     foreign::{self, CBox},
+    store::StorePath,
     util,
 };
 
@@ -13,43 +14,72 @@ pub extern "C" fn unpack_tarfile(
 }
 
 #[no_mangle]
-pub extern "C" fn rust_test() {
-    use crate::store::{self, Store};
-    use std::path::Path;
-    use tokio::runtime::Runtime;
-
-    let fut = async move {
-        let store: Box<dyn Store> = Box::new(store::BinaryCacheStore::new(
-            "http://cache.nixos.org".to_string(),
-        ));
-
-        let path = store
-            .parse_store_path(&Path::new(
-                "/nix/store/7h7qgvs4kgzsn8a6rb273saxyqh4jxlz-konsole-18.12.3",
-            ))
-            .unwrap();
-
-        /*
-        let info = store.query_path_info(&path).await.unwrap();
-
-        eprintln!("INFO = {:?}", info);
-         */
-
-        let closure = store
-            .compute_path_closure(vec![path].into_iter().collect())
-            .await
-            .unwrap();
-
-        eprintln!("CLOSURE = {:?}", closure.len());
-    };
-
-    let rt = Runtime::new().unwrap();
-
-    rt.block_on(fut);
-
-    /*
-    let file = std::fs::File::open("test.nar").unwrap();
-
-    crate::nar::parse(&mut std::io::BufReader::new(file)).unwrap();
-    */
+pub unsafe extern "C" fn ffi_String_new(s: &str, out: *mut String) {
+    // FIXME: check whether 's' is valid UTF-8?
+    out.write(s.to_string())
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn ffi_String_drop(self_: *mut String) {
+    std::ptr::drop_in_place(self_);
+}
+
+#[no_mangle]
+pub extern "C" fn ffi_StorePath_new(
+    path: &str,
+    store_dir: &str,
+) -> Result<StorePath, error::CppException> {
+    StorePath::new(std::path::Path::new(path), store_dir).map_err(|err| err.into())
+}
+
+#[no_mangle]
+pub extern "C" fn ffi_StorePath_new2(
+    hash: &[u8; crate::store::path::STORE_PATH_HASH_BYTES],
+    name: &str,
+) -> Result<StorePath, error::CppException> {
+    StorePath::from_parts(*hash, name).map_err(|err| err.into())
+}
+
+#[no_mangle]
+pub extern "C" fn ffi_StorePath_fromBaseName(
+    base_name: &str,
+) -> Result<StorePath, error::CppException> {
+    StorePath::new_from_base_name(base_name).map_err(|err| err.into())
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn ffi_StorePath_drop(self_: *mut StorePath) {
+    std::ptr::drop_in_place(self_);
+}
+
+#[no_mangle]
+pub extern "C" fn ffi_StorePath_to_string(self_: &StorePath) -> String {
+    format!("{}", self_)
+}
+
+#[no_mangle]
+pub extern "C" fn ffi_StorePath_less_than(a: &StorePath, b: &StorePath) -> bool {
+    a < b
+}
+
+#[no_mangle]
+pub extern "C" fn ffi_StorePath_eq(a: &StorePath, b: &StorePath) -> bool {
+    a == b
+}
+
+#[no_mangle]
+pub extern "C" fn ffi_StorePath_clone(self_: &StorePath) -> StorePath {
+    self_.clone()
+}
+
+#[no_mangle]
+pub extern "C" fn ffi_StorePath_name(self_: &StorePath) -> &str {
+    self_.name.name()
+}
+
+#[no_mangle]
+pub extern "C" fn ffi_StorePath_hash_data(
+    self_: &StorePath,
+) -> &[u8; crate::store::path::STORE_PATH_HASH_BYTES] {
+    self_.hash.hash()
 }

nix-rust/src/error.rs

@@ -19,6 +19,7 @@ pub enum Error {
     BadNarField(String),
     BadExecutableField,
     IOError(std::io::Error),
+    #[cfg(unused)]
     HttpError(hyper::error::Error),
     Misc(String),
     Foreign(CppException),
@@ -30,6 +31,7 @@ impl From<std::io::Error> for Error {
     }
 }
 
+#[cfg(unused)]
 impl From<hyper::error::Error> for Error {
     fn from(err: hyper::error::Error) -> Self {
         Error::HttpError(err)
@@ -58,6 +60,7 @@ impl fmt::Display for Error {
             Error::BadNarField(s) => write!(f, "unrecognized NAR field '{}'", s),
             Error::BadExecutableField => write!(f, "bad 'executable' field in NAR"),
             Error::IOError(err) => write!(f, "I/O error: {}", err),
+            #[cfg(unused)]
             Error::HttpError(err) => write!(f, "HTTP error: {}", err),
             Error::Foreign(_) => write!(f, "<C++ exception>"), // FIXME
             Error::Misc(s) => write!(f, "{}", s),

nix-rust/src/lib.rs

@@ -12,6 +12,7 @@ extern crate proptest;
 mod c;
 mod error;
 mod foreign;
+#[cfg(unused)]
 mod nar;
 mod store;
 mod util;

nix-rust/src/store/mod.rs

@@ -1,9 +1,17 @@
+pub mod path;
+
+#[cfg(unused)]
 mod binary_cache_store;
-mod path;
+#[cfg(unused)]
 mod path_info;
+#[cfg(unused)]
 mod store;
 
-pub use binary_cache_store::BinaryCacheStore;
 pub use path::{StorePath, StorePathHash, StorePathName};
+
+#[cfg(unused)]
+pub use binary_cache_store::BinaryCacheStore;
+#[cfg(unused)]
 pub use path_info::PathInfo;
+#[cfg(unused)]
 pub use store::Store;

nix-rust/src/store/path.rs

@@ -23,6 +23,13 @@ impl StorePath {
         )
     }
 
+    pub fn from_parts(hash: [u8; STORE_PATH_HASH_BYTES], name: &str) -> Result<Self, Error> {
+        Ok(StorePath {
+            hash: StorePathHash(hash),
+            name: StorePathName::new(name)?,
+        })
+    }
+
     pub fn new_from_base_name(base_name: &str) -> Result<Self, Error> {
         if base_name.len() < STORE_PATH_HASH_CHARS + 1
             || base_name.as_bytes()[STORE_PATH_HASH_CHARS] != '-' as u8
@@ -43,7 +50,7 @@ impl fmt::Display for StorePath {
     }
 }
 
-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 pub struct StorePathHash([u8; STORE_PATH_HASH_BYTES]);
 
 impl StorePathHash {
@@ -55,6 +62,10 @@ impl StorePathHash {
         bytes.copy_from_slice(&v[0..STORE_PATH_HASH_BYTES]);
         Ok(Self(bytes))
     }
+
+    pub fn hash<'a>(&'a self) -> &'a [u8; STORE_PATH_HASH_BYTES] {
+        &self.0
+    }
 }
 
 impl fmt::Display for StorePathHash {
@@ -63,6 +74,21 @@ impl fmt::Display for StorePathHash {
     }
 }
 
+impl Ord for StorePathHash {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        // Historically we've sorted store paths by their base32
+        // serialization, but our base32 encodes bytes in reverse
+        // order. So compare them in reverse order as well.
+        self.0.iter().rev().cmp(other.0.iter().rev())
+    }
+}
+
+impl PartialOrd for StorePathHash {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
 pub struct StorePathName(String);
 
@@ -93,6 +119,10 @@ impl StorePathName {
 
         Ok(Self(s.to_string()))
     }
+
+    pub fn name<'a>(&'a self) -> &'a str {
+        &self.0
+    }
 }
 
 impl fmt::Display for StorePathName {