Reversion and cleanup

Moving the `aeronmd` example to the sys crate caused issues for static
linking because of the `tempfile` crate.

Revert "Install luuid for Linux"
Revert "Fix some Cargo.toml issues"
Revert "More minor cleanup"

.travis.yml

@@ -6,11 +6,6 @@ os:
   - osx
   - windows
 
-addons:
-  apt:
-    packages:
-      - uuid-dev
-
 cache:
   - cargo
 

Cargo.toml

@@ -16,4 +16,6 @@ aeron_driver-sys = { path = "./aeron_driver-sys" }
 memmap = "0.7"
 
 [dev-dependencies]
+clap = "2.33"
+ctrlc = "3.1.3"
 tempfile = "3.1"

aeron_driver-sys/Cargo.toml

@@ -15,8 +15,3 @@ dunce = "1.0.0"
 
 [features]
 static = []
-
-[dev-dependencies]
-clap = "2.33"
-ctrlc = "3.1.3"
-tempfile = "3.1"

aeron_driver-sys/src/lib.rs

@@ -6,6 +6,8 @@ include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
 
 #[cfg(test)]
 mod tests {
+    use crate::*;
+    use std::convert::TryInto;
 
     #[test]
     fn version_check() {

src/client/cnc_descriptor.rs

@@ -60,7 +60,7 @@ pub struct MetaDataDefinition {
     _pid: i64,
 }
 
-/// Version code for the Aeron CnC file format that this client is compatible with
+/// Version code for the Aeron CnC file format
 pub const CNC_VERSION: i32 = crate::sematic_version_compose(0, 0, 16);
 
 /// Filename for the CnC file located in the Aeron directory