From b3fa43f6e0c94d39fc08846c53eac48e2903b97f Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 22 Aug 2013 22:12:56 -0700
Subject: [PATCH] rt: Remove rust_exchange_alloc

---
 mk/rt.mk                       |  1 -
 src/rt/rust_exchange_alloc.cpp | 35 ----------------------------------
 src/rt/rust_exchange_alloc.h   | 24 -----------------------
 src/rt/rust_util.h             | 11 -----------
 4 files changed, 71 deletions(-)
 delete mode 100644 src/rt/rust_exchange_alloc.cpp
 delete mode 100644 src/rt/rust_exchange_alloc.h

diff --git a/mk/rt.mk b/mk/rt.mk
index f2a33bb1381..14bdbe6445c 100644
--- a/mk/rt.mk
+++ b/mk/rt.mk
@@ -75,7 +75,6 @@ RUNTIME_CXXS_$(1)_$(2) := \
               rt/rust_gc_metadata.cpp \
               rt/rust_util.cpp \
               rt/rust_log.cpp \
-              rt/rust_exchange_alloc.cpp \
               rt/isaac/randport.cpp \
               rt/miniz.cpp \
               rt/rust_abi.cpp \
diff --git a/src/rt/rust_exchange_alloc.cpp b/src/rt/rust_exchange_alloc.cpp
deleted file mode 100644
index 658d97031ce..00000000000
--- a/src/rt/rust_exchange_alloc.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#include "rust_exchange_alloc.h"
-#include "sync/sync.h"
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-#include <stdio.h>
-
-void *
-rust_exchange_alloc::malloc(size_t size) {
-  void *value = ::malloc(size);
-  assert(value);
-  return value;
-}
-
-void *
-rust_exchange_alloc::realloc(void *ptr, size_t size) {
-  void *new_ptr = ::realloc(ptr, size);
-  assert(new_ptr);
-  return new_ptr;
-}
-
-void
-rust_exchange_alloc::free(void *ptr) {
-  ::free(ptr);
-}
diff --git a/src/rt/rust_exchange_alloc.h b/src/rt/rust_exchange_alloc.h
deleted file mode 100644
index 9699ef6b5e9..00000000000
--- a/src/rt/rust_exchange_alloc.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#ifndef RUST_EXCHANGE_ALLOC_H
-#define RUST_EXCHANGE_ALLOC_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-class rust_exchange_alloc {
- public:
-    void *malloc(size_t size);
-    void *realloc(void *mem, size_t size);
-    void free(void *mem);
-};
-
-#endif
diff --git a/src/rt/rust_util.h b/src/rt/rust_util.h
index 7c531297ccd..acedbe31a6b 100644
--- a/src/rt/rust_util.h
+++ b/src/rt/rust_util.h
@@ -12,7 +12,6 @@
 #define RUST_UTIL_H
 
 #include <limits.h>
-#include "rust_exchange_alloc.h"
 #include "rust_type.h"
 
 extern struct type_desc str_body_tydesc;
@@ -57,16 +56,6 @@ vec_data(rust_vec *v) {
     return reinterpret_cast<T*>(v->data);
 }
 
-inline void reserve_vec_exact(rust_vec** vpp,
-                              size_t size) {
-    if (size > (*vpp)->alloc) {
-        rust_exchange_alloc exchange_alloc;
-        *vpp = (rust_vec*)exchange_alloc
-            .realloc(*vpp, size + sizeof(rust_vec));
-        (*vpp)->alloc = size;
-    }
-}
-
 typedef rust_vec rust_str;
 
 inline size_t get_box_size(size_t body_size, size_t body_align) {