WIP: bump rust to unstable-2020-04-06

Makefile

@@ -24,8 +24,8 @@ help:
 SHELL = /bin/bash
 CORE_RUST_VERSION ?= nightly-2019-07-14
 TOOLS_RUST_VERSION ?= nightly-2019-07-14
-CARGO = RUSTFLAGS="-Z external-macro-backtrace -D warnings" RUST_BACKTRACE=1 rustup run $(CORE_RUST_VERSION) cargo $(CARGO_ARGS)
-CARGO_TOOLS = RUSTFLAGS="-Z external-macro-backtrace -D warnings" RUST_BACKTRACE=1 rustup run $(TOOLS_RUST_VERSION) cargo $(CARGO_ARGS)
+CARGO = RUSTFLAGS="-Z macro-backtrace -D warnings" RUST_BACKTRACE=1 rustup run $(CORE_RUST_VERSION) cargo $(CARGO_ARGS)
+CARGO_TOOLS = RUSTFLAGS="-Z macro-backtrace -D warnings" RUST_BACKTRACE=1 rustup run $(TOOLS_RUST_VERSION) cargo $(CARGO_ARGS)
 CARGO_TARPULIN_INSTALL = RUSTFLAGS="--cfg procmacro2_semver_exempt -D warnings" RUST_BACKTRACE=1 cargo $(CARGO_ARGS) +$(CORE_RUST_VERSION)
 OPENSSL_STATIC = 1
 

config.nix

@@ -5,8 +5,8 @@ let
  # tag will ultimately be current version when it hits holonix
  # https://github.com/holochain/holonix/blob/master/release/default.nix#L7
  tag = "v${current}";
- holonix-version = "v0.0.72";
- holonix-sha256 = "090h5gqmfm40vkqhf1ky1n3ml24f5py04bvn50dkw0v8xzmsl4sk";
+ holonix-version = "mmahut/rust";
+ holonix-sha256 = "1yzs296jy4ci35k010x42780x4nm1m7rw0fpmy9f637yg13iimsi";
 in
 rec {
 
@@ -32,7 +32,7 @@ rec {
    sha256 = holonix-sha256;
 
    # the github owner of the holonix repo
-   owner = "holochain";
+   owner = "mmahut";
 
    # the name of the holonix repo
    repo = "holonix";

crates/core_types/build.rs

@@ -28,7 +28,7 @@ fn main() {
                     basename
                         .split('-')
                         .nth(0)
-                        .and_then(|hash| Some(hash.to_string()))
+                        .map(|hash| hash.to_string())
                 })
             })
         })

crates/core_types/src/bits_n_pieces.rs

@@ -8,7 +8,7 @@ pub fn u32_high_bits(i: u32) -> u16 {
 
 /// returns the u16 low bits from a u32 by doing a lossy cast
 pub fn u32_low_bits(i: u32) -> u16 {
-    (i as u16)
+    i as u16
 }
 
 /// splits the high and low bits of u32 into a tuple of u16, for destructuring convenience
@@ -26,7 +26,7 @@ pub fn u64_high_bits(i: u64) -> u32 {
 }
 
 pub fn u64_low_bits(i: u64) -> u32 {
-    (i as u32)
+    i as u32
 }
 
 pub fn u64_split_bits(i: u64) -> (u32, u32) {

crates/core_types/src/eav/storage.rs

@@ -81,7 +81,7 @@ pub fn increment_key_till_no_collision(
     map: BTreeSet<EntityAttributeValueIndex>,
 ) -> HcResult<EntityAttributeValueIndex> {
     if map.iter().any(|e| e.index() == eav.index()) {
-        let timestamp = eav.clone().index() + 1;
+        let timestamp = eav.index() + 1;
         eav.set_index(timestamp);
         increment_key_till_no_collision(eav, map)
     } else {

crates/core_types/src/error/ribosome_error.rs

@@ -240,7 +240,8 @@ impl RibosomeErrorCode {
             10 => UnknownEntryType,
             12 => EntryNotFound,
             13 => WorkflowFailed,
-            1 | _ => Unspecified,
+            1 => Unspecified,
+            _ => Unspecified,
         }
     }
 

crates/in_stream/src/mem.rs

@@ -356,7 +356,7 @@ impl MemManager {
 // this is the actual singleton global reference
 lazy_static! {
     static ref MEM_MANAGER: parking_lot::Mutex<MemManager> =
-        { parking_lot::Mutex::new(MemManager::new()) };
+        parking_lot::Mutex::new(MemManager::new());
 }
 
 fn get_mem_manager() -> parking_lot::MutexGuard<'static, MemManager> {

crates/sim2h/src/websocket/mem_stream.rs

@@ -275,7 +275,7 @@ impl MemManager {
 
 // this is the actual singleton global reference
 lazy_static! {
-    static ref MEM_MANAGER: GhostMutex<MemManager> = { GhostMutex::new(MemManager::new()) };
+    static ref MEM_MANAGER: GhostMutex<MemManager> = GhostMutex::new(MemManager::new());
 }
 
 #[cfg(test)]