From 2a3f0b9c4d8d352c360f824632137ee32bc1cb52 Mon Sep 17 00:00:00 2001
From: ko1N <ko1N1337@gmail.com>
Date: Fri, 27 Nov 2020 23:24:56 +0100
Subject: [PATCH] Updated to next branch

---
 leechcore-sys/src/lib.rs               | 1 +
 memflow-pcileech/Cargo.toml            | 2 +-
 memflow-pcileech/examples/read_phys.rs | 2 +-
 memflow-pcileech/src/lib.rs            | 7 ++++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/leechcore-sys/src/lib.rs b/leechcore-sys/src/lib.rs
index 437f6a6..3d7e63d 100644
--- a/leechcore-sys/src/lib.rs
+++ b/leechcore-sys/src/lib.rs
@@ -3,6 +3,7 @@
 #![allow(non_camel_case_types)]
 #![allow(improper_ctypes)]
 #![allow(clippy::missing_safety_doc)]
+#![allow(clippy::redundant_static_lifetimes)]
 
 include!(concat!(env!("OUT_DIR"), "/leechcore.rs"));
 
diff --git a/memflow-pcileech/Cargo.toml b/memflow-pcileech/Cargo.toml
index 715cfe1..05604ca 100644
--- a/memflow-pcileech/Cargo.toml
+++ b/memflow-pcileech/Cargo.toml
@@ -16,7 +16,7 @@ categories = [ "api-bindings", "memory-management", "os" ]
 crate-type = ["lib", "cdylib"]
 
 [dependencies]
-memflow = { git = "https://github.com/memflow/memflow", branch = "next", features = ["inventory", "serde_derive"] }
+memflow = { git = "https://github.com/memflow/memflow", branch = "next", features = ["inventory", "memmapfiles"] }
 log = { version = "0.4", default-features = false }
 simple_logger = "1.0"
 leechcore-sys = { path = "../leechcore-sys" }
diff --git a/memflow-pcileech/examples/read_phys.rs b/memflow-pcileech/examples/read_phys.rs
index 8c4caf1..cfd09fc 100644
--- a/memflow-pcileech/examples/read_phys.rs
+++ b/memflow-pcileech/examples/read_phys.rs
@@ -3,7 +3,7 @@ use std::time::Instant;
 
 use log::{info, Level};
 
-use memflow::*;
+use memflow::prelude::v1::*;
 
 fn main() {
     simple_logger::SimpleLogger::new()
diff --git a/memflow-pcileech/src/lib.rs b/memflow-pcileech/src/lib.rs
index 0ad9af9..123b2f5 100644
--- a/memflow-pcileech/src/lib.rs
+++ b/memflow-pcileech/src/lib.rs
@@ -9,8 +9,8 @@ use std::sync::{Arc, Mutex};
 
 use log::{error, info};
 
-use memflow::*;
-use memflow_derive::connector;
+use memflow::prelude::v1::*;
+use memflow::derive::connector;
 
 use leechcore_sys::*;
 
@@ -66,6 +66,7 @@ impl Clone for PciLeech {
 }
 
 // TODO: proper drop + free impl -> LcMemFree(pLcErrorInfo);
+#[allow(clippy::mutex_atomic)]
 impl PciLeech {
     pub fn new(device: &str) -> Result<Self> {
         Self::with_mapping(device, MemoryMap::new())
@@ -337,7 +338,7 @@ impl PhysicalMemory for PciLeech {
 }
 
 /// Creates a new PciLeech Connector instance.
-#[connector(name = "pcileech")]
+#[connector(name = "pcileech", ty = " PciLeech")]
 pub fn create_connector(args: &ConnectorArgs) -> Result<PciLeech> {
     let device = args
         .get("device")