From 4a318d6e0f632d1915e4475325ededb94f6eb42c Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 29 Oct 2013 17:02:37 -0700
Subject: [PATCH 1/2] rt: Remove rust_thread::detach

---
 src/rt/sync/rust_thread.cpp | 9 ---------
 src/rt/sync/rust_thread.h   | 1 -
 2 files changed, 10 deletions(-)

diff --git a/src/rt/sync/rust_thread.cpp b/src/rt/sync/rust_thread.cpp
index a78153523d2..7223d187137 100644
--- a/src/rt/sync/rust_thread.cpp
+++ b/src/rt/sync/rust_thread.cpp
@@ -63,12 +63,3 @@ rust_thread::join() {
 #endif
    thread = 0;
 }
-
-void
-rust_thread::detach() {
-#if !defined(__WIN32__)
-    // Don't leak pthread resources.
-    // http://crosstantine.blogspot.com/2010/01/pthreadcreate-memory-leak.html
-    CHECKED(pthread_detach(thread));
-#endif
-}
diff --git a/src/rt/sync/rust_thread.h b/src/rt/sync/rust_thread.h
index cad87e514b5..257eefceb43 100644
--- a/src/rt/sync/rust_thread.h
+++ b/src/rt/sync/rust_thread.h
@@ -33,7 +33,6 @@ class rust_thread {
     virtual void run() = 0;
 
     void join();
-    void detach();
 };
 
 #endif /* RUST_THREAD_H */

From fce9d7fc37650a5138be180e955a25a7f29409bd Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 29 Oct 2013 17:04:20 -0700
Subject: [PATCH 2/2] rt: Remove array_list.h

---
 src/rt/util/array_list.h | 149 ---------------------------------------
 1 file changed, 149 deletions(-)
 delete mode 100644 src/rt/util/array_list.h

diff --git a/src/rt/util/array_list.h b/src/rt/util/array_list.h
deleted file mode 100644
index 0852cf9497e..00000000000
--- a/src/rt/util/array_list.h
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2012 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 ARRAY_LIST_H
-#define ARRAY_LIST_H
-
-#include <inttypes.h>
-#include <stddef.h>
-#include <new>
-
-/**
- * A simple, resizable array list. Note that this only works with POD types
- * (because data is grown via realloc).
- */
-template<typename T> class array_list {
-    static const size_t INITIAL_CAPACITY = 8;
-    size_t _size;
-    T * _data;
-    size_t _capacity;
-private:
-    // private and left undefined to disable copying
-    array_list(const array_list& rhs);
-    array_list& operator=(const array_list& rhs);
-public:
-    array_list();
-    ~array_list();
-    size_t size() const;
-    int32_t append(T value);
-    int32_t push(T value);
-    void pop(T *value);
-    bool replace(T old_value, T new_value);
-    int32_t index_of(T value) const;
-    bool is_empty() const;
-    T* data();
-    const T* data() const;
-    T & operator[](size_t index);
-    const T & operator[](size_t index) const;
-};
-
-template<typename T>
-array_list<T>::array_list() {
-    _size = 0;
-    _capacity = INITIAL_CAPACITY;
-    _data = (T *) malloc(sizeof(T) * _capacity);
-}
-
-template<typename T>
-array_list<T>::~array_list() {
-    free(_data);
-}
-
-template<typename T> size_t
-array_list<T>::size() const {
-    return _size;
-}
-
-template<typename T> int32_t
-array_list<T>::append(T value) {
-    return push(value);
-}
-
-template<typename T> int32_t
-array_list<T>::push(T value) {
-    if (_size == _capacity) {
-        size_t new_capacity = _capacity * 2;
-        void* buffer = realloc(_data, new_capacity * sizeof(T));
-        if (buffer == NULL) {
-            fprintf(stderr,
-                    "array_list::push> "
-                    "Out of memory allocating %ld bytes",
-                    (long int) (new_capacity * sizeof(T)));
-            abort();
-        }
-        _data = (T *) buffer;
-        _capacity = new_capacity;
-    }
-    _data[_size ++] = value;
-    return _size - 1;
-}
-
-template<typename T> void
-array_list<T>::pop(T *value) {
-    assert(_size > 0);
-    if (value != NULL) {
-        *value = _data[-- _size];
-    } else {
-        -- _size;
-    }
-}
-
-/**
- * Replaces the old_value in the list with the new_value.
- * Returns the true if the replacement succeeded, or false otherwise.
- */
-template<typename T> bool
-array_list<T>::replace(T old_value, T new_value) {
-    int index = index_of(old_value);
-    if (index < 0) {
-        return false;
-    }
-    _data[index] = new_value;
-    return true;
-}
-
-template<typename T> int32_t
-array_list<T>::index_of(T value) const {
-    for (size_t i = 0; i < _size; i++) {
-        if (_data[i] == value) {
-            return i;
-        }
-    }
-    return -1;
-}
-
-template<typename T> T &
-array_list<T>::operator[](size_t index) {
-    assert(index < size());
-    return _data[index];
-}
-
-template<typename T> const T &
-array_list<T>::operator[](size_t index) const {
-    assert(index < size());
-    return _data[index];
-}
-
-template<typename T> bool
-array_list<T>::is_empty() const {
-    return _size == 0;
-}
-
-template<typename T> T*
-array_list<T>::data() {
-    return _data;
-}
-
-template<typename T> const T*
-array_list<T>::data() const {
-    return _data;
-}
-
-#endif /* ARRAY_LIST_H */