Merge branch 'use-default-allocator'

2 files changed, 1 insertions, 9 deletions

diff --git a/mullvad-cli/src/main.rs b/mullvad-cli/src/main.rs
index 05b6c89163..dc4ffe13db 100644
--- a/mullvad-cli/src/main.rs
+++ b/mullvad-cli/src/main.rs
@@ -12,13 +12,10 @@ extern crate error_chain;
 use clap::{crate_authors, crate_description, crate_name};
 use error_chain::ChainedError;
 use mullvad_ipc_client::{new_standalone_ipc_client, DaemonRpcClient};
-use std::{alloc::System, io};
+use std::io;
 
 mod cmds;
 
-#[global_allocator]
-static GLOBAL: System = System;
-
 pub const PRODUCT_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/product-version.txt"));
 
 
diff --git a/mullvad-problem-report/src/main.rs b/mullvad-problem-report/src/main.rs
index 6c9fad194a..8146b3e769 100644
--- a/mullvad-problem-report/src/main.rs
+++ b/mullvad-problem-report/src/main.rs
@@ -14,7 +14,6 @@ use error_chain::ChainedError;
 use lazy_static::lazy_static;
 use regex::Regex;
 use std::{
-    alloc::System,
     borrow::Cow,
     cmp::min,
     collections::{HashMap, HashSet},
@@ -26,10 +25,6 @@ use std::{
 use tokio_core::reactor::Core;
 
 
-#[global_allocator]
-static GLOBAL: System = System;
-
-
 mod metadata;
 
 /// Maximum number of bytes to read from each log file