From 5beea76624e408029192e8a8717c30dbadc8fbad Mon Sep 17 00:00:00 2001
From: Acrimon <joel.wejdenstal@gmail.com>
Date: Tue, 29 Oct 2019 06:55:45 +0000
Subject: [PATCH] Remove heaptrack as it is now deprecated.

---
 server-cli/Cargo.toml  | 1 -
 server-cli/src/main.rs | 3 ---
 voxygen/Cargo.toml     | 3 +--
 voxygen/src/main.rs    | 5 -----
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/server-cli/Cargo.toml b/server-cli/Cargo.toml
index f590e8f5dd..484684eb55 100644
--- a/server-cli/Cargo.toml
+++ b/server-cli/Cargo.toml
@@ -8,6 +8,5 @@ edition = "2018"
 server = { package = "veloren-server", path = "../server" }
 common = { package = "veloren-common", path = "../common" }
 
-heaptrack = "0.3.0"
 log = "0.4.8"
 pretty_env_logger = "0.3.0"
diff --git a/server-cli/src/main.rs b/server-cli/src/main.rs
index feafbdd6d0..f19022a709 100644
--- a/server-cli/src/main.rs
+++ b/server-cli/src/main.rs
@@ -1,13 +1,10 @@
 #![deny(unsafe_code)]
 
 use common::clock::Clock;
-use heaptrack::track_mem;
 use log::info;
 use server::{Event, Input, Server, ServerSettings};
 use std::time::Duration;
 
-track_mem!();
-
 const TPS: u64 = 30;
 
 fn main() {
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index bd28c7ceea..951e46be42 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -10,7 +10,7 @@ gl = ["gfx_device_gl"]
 discord = ["discord-rpc-sdk", "lazy_static"]
 singleplayer = ["server"]
 
-default = ["gl", "singleplayer", "msgbox", "heaptrack"]
+default = ["gl", "singleplayer", "msgbox"]
 
 [dependencies]
 common = { package = "veloren-common", path = "../common" }
@@ -60,7 +60,6 @@ frustum_query = "0.1.2"
 rodio = { git = "https://github.com/RustAudio/rodio", rev = "e5474a2"}
 cpal = "0.10"
 crossbeam = "0.7.2"
-heaptrack = { version = "0.3.0", optional = true }
 hashbrown = { version = "0.5.0", features = ["serde", "nightly"] }
 chrono = "0.4.7"
 rust-argon2 = "0.5"
diff --git a/voxygen/src/main.rs b/voxygen/src/main.rs
index fb6fac48a3..8018da180d 100644
--- a/voxygen/src/main.rs
+++ b/voxygen/src/main.rs
@@ -38,11 +38,6 @@ use log::{self, debug, error, info};
 use simplelog::{CombinedLogger, Config, TermLogger, TerminalMode, WriteLogger};
 use std::{fs::File, mem, panic, str::FromStr};
 
-#[cfg(feature = "heaptrack")]
-use heaptrack::track_mem;
-#[cfg(feature = "heaptrack")]
-track_mem!();
-
 /// A type used to store state that is shared between all play states.
 pub struct GlobalState {
     settings: Settings,