auto merge of #4973 : thestinger/rust/rt, r=brson

5 files changed, 0 insertions, 1256 deletions

diff --git a/src/rt/rust_globals.h b/src/rt/rust_globals.h
index 3cc8550104a..3d3ce7562b5 100644
--- a/src/rt/rust_globals.h
+++ b/src/rt/rust_globals.h
@@ -37,8 +37,6 @@
 #include <math.h>
 #include <assert.h>
 
-#include "uthash.h"
-
 #if defined(__WIN32__)
 extern "C" {
 #include <windows.h>
diff --git a/src/rt/rust_kernel.h b/src/rt/rust_kernel.h
index e65a0bd9289..ec0515faeaf 100644
--- a/src/rt/rust_kernel.h
+++ b/src/rt/rust_kernel.h
@@ -49,7 +49,6 @@
 #include "rust_log.h"
 #include "rust_sched_reaper.h"
 #include "rust_type.h"
-#include "util/hash_map.h"
 #include "sync/lock_and_signal.h"
 
 class rust_scheduler;
diff --git a/src/rt/uthash/uthash.h b/src/rt/uthash/uthash.h
deleted file mode 100644
index 28021b61611..00000000000
--- a/src/rt/uthash/uthash.h
+++ /dev/null
@@ -1,766 +0,0 @@
-/*
-Copyright (c) 2003-2009, Troy D. Hanson     http://uthash.sourceforge.net
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef UTHASH_H
-#define UTHASH_H 
-
-#include <string.h>   /* memcmp,strlen */
-#include <stddef.h>   /* ptrdiff_t */
-#include <inttypes.h> /* uint32_t etc */
-
-#define UTHASH_VERSION 1.6
-
-/* C++ requires extra stringent casting */
-#if defined __cplusplus
-#define TYPEOF(x) (typeof(x))
-#else
-#define TYPEOF(x)
-#endif
-
-
-#define uthash_fatal(msg) exit(-1)        /* fatal error (out of memory,etc) */
-#define uthash_bkt_malloc(sz) malloc(sz)  /* malloc fcn for UT_hash_bucket's */
-#define uthash_bkt_free(ptr) free(ptr)    /* free fcn for UT_hash_bucket's   */
-#define uthash_tbl_malloc(sz) malloc(sz)  /* malloc fcn for UT_hash_table    */
-#define uthash_tbl_free(ptr) free(ptr)    /* free fcn for UT_hash_table      */
-
-#define uthash_noexpand_fyi(tbl)          /* can be defined to log noexpand  */
-#define uthash_expand_fyi(tbl)            /* can be defined to log expands   */
-
-/* initial number of buckets */
-#define HASH_INITIAL_NUM_BUCKETS 32      /* initial number of buckets        */
-#define HASH_INITIAL_NUM_BUCKETS_LOG2 5  /* lg2 of initial number of buckets */
-#define HASH_BKT_CAPACITY_THRESH 10      /* expand when bucket count reaches */
-
-/* calculate the element whose hash handle address is hhe */
-#define ELMT_FROM_HH(tbl,hhp) ((void*)(((char*)hhp) - (tbl)->hho))
-
-#define HASH_FIND(hh,head,keyptr,keylen,out)                                   \
-do {                                                                           \
-  unsigned _hf_bkt,_hf_hashv;                                                  \
-  out=TYPEOF(out)head;                                                         \
-  if (head) {                                                                  \
-     HASH_FCN(keyptr,keylen, (head)->hh.tbl->num_buckets, _hf_hashv, _hf_bkt); \
-     HASH_FIND_IN_BKT((head)->hh.tbl, hh, (head)->hh.tbl->buckets[ _hf_bkt ],  \
-                      keyptr,keylen,out);                                      \
-  }                                                                            \
-} while (0)
-
-#define HASH_MAKE_TABLE(hh,head)                                               \
-do {                                                                           \
-  (head)->hh.tbl = (UT_hash_table*)uthash_tbl_malloc(                          \
-                  sizeof(UT_hash_table));                                      \
-  if (!((head)->hh.tbl))  { uthash_fatal( "out of memory"); }                  \
-  memset((head)->hh.tbl, 0, sizeof(UT_hash_table));                            \
-  (head)->hh.tbl->tail = &((head)->hh);                                        \
-  (head)->hh.tbl->num_buckets = HASH_INITIAL_NUM_BUCKETS;                      \
-  (head)->hh.tbl->log2_num_buckets = HASH_INITIAL_NUM_BUCKETS_LOG2;            \
-  (head)->hh.tbl->hho = (char*)(&(head)->hh) - (char*)(head);                  \
-  (head)->hh.tbl->buckets = (UT_hash_bucket*)uthash_bkt_malloc(                \
-          HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket));             \
-  if (! (head)->hh.tbl->buckets) { uthash_fatal( "out of memory"); }           \
-  memset((head)->hh.tbl->buckets, 0,                                           \
-          HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket));             \
-} while(0)
-
-#define HASH_ADD(hh,head,fieldname,keylen_in,add)                              \
-        HASH_ADD_KEYPTR(hh,head,&add->fieldname,keylen_in,add)
- 
-#define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add)                          \
-do {                                                                           \
- unsigned _ha_bkt;                                                             \
- (add)->hh.next = NULL;                                                        \
- (add)->hh.key = (char*)keyptr;                                                \
- (add)->hh.keylen = keylen_in;                                                 \
- if (!(head)) {                                                                \
-    head = (add);                                                              \
-    (head)->hh.prev = NULL;                                                    \
-    HASH_MAKE_TABLE(hh,head);                                                  \
- } else {                                                                      \
-    (head)->hh.tbl->tail->next = (add);                                        \
-    (add)->hh.prev = ELMT_FROM_HH((head)->hh.tbl, (head)->hh.tbl->tail);       \
-    (head)->hh.tbl->tail = &((add)->hh);                                       \
- }                                                                             \
- (head)->hh.tbl->num_items++;                                                  \
- (add)->hh.tbl = (head)->hh.tbl;                                               \
- HASH_FCN(keyptr,keylen_in, (head)->hh.tbl->num_buckets,                       \
-         (add)->hh.hashv, _ha_bkt);                                            \
- HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt],&(add)->hh);                 \
- HASH_EMIT_KEY(hh,head,keyptr,keylen_in);                                      \
- HASH_FSCK(hh,head);                                                           \
-} while(0)
-
-#define HASH_TO_BKT( hashv, num_bkts, bkt )                                    \
-do {                                                                           \
-  bkt = ((hashv) & ((num_bkts) - 1));                                          \
-} while(0)
-
-/* delete "delptr" from the hash table.
- * "the usual" patch-up process for the app-order doubly-linked-list.
- * The use of _hd_hh_del below deserves special explanation.
- * These used to be expressed using (delptr) but that led to a bug
- * if someone used the same symbol for the head and deletee, like
- *  HASH_DELETE(hh,users,users);
- * We want that to work, but by changing the head (users) below
- * we were forfeiting our ability to further refer to the deletee (users)
- * in the patch-up process. Solution: use scratch space in the table to
- * copy the deletee pointer, then the latter references are via that
- * scratch pointer rather than through the repointed (users) symbol.
- */
-#define HASH_DELETE(hh,head,delptr)                                            \
-do {                                                                           \
-    unsigned _hd_bkt;                                                          \
-    struct UT_hash_handle *_hd_hh_del;                                         \
-    if ( ((delptr)->hh.prev == NULL) && ((delptr)->hh.next == NULL) )  {       \
-        uthash_bkt_free((head)->hh.tbl->buckets );                             \
-        uthash_tbl_free((head)->hh.tbl);                                       \
-        head = NULL;                                                           \
-    } else {                                                                   \
-        _hd_hh_del = &((delptr)->hh);                                          \
-        if ((delptr) == ELMT_FROM_HH((head)->hh.tbl,(head)->hh.tbl->tail)) {   \
-            (head)->hh.tbl->tail =                                             \
-                (UT_hash_handle*)((char*)((delptr)->hh.prev) +                 \
-                (head)->hh.tbl->hho);                                          \
-        }                                                                      \
-        if ((delptr)->hh.prev) {                                               \
-            ((UT_hash_handle*)((char*)((delptr)->hh.prev) +                    \
-                    (head)->hh.tbl->hho))->next = (delptr)->hh.next;           \
-        } else {                                                               \
-            head = TYPEOF(head)((delptr)->hh.next);                            \
-        }                                                                      \
-        if (_hd_hh_del->next) {                                                \
-            ((UT_hash_handle*)((char*)_hd_hh_del->next +                       \
-                    (head)->hh.tbl->hho))->prev =                              \
-                    _hd_hh_del->prev;                                          \
-        }                                                                      \
-        HASH_TO_BKT( _hd_hh_del->hashv, (head)->hh.tbl->num_buckets, _hd_bkt); \
-        HASH_DEL_IN_BKT(hh,(head)->hh.tbl->buckets[_hd_bkt], _hd_hh_del);      \
-        (head)->hh.tbl->num_items--;                                           \
-    }                                                                          \
-    HASH_FSCK(hh,head);                                                        \
-} while (0)
-
-
-/* convenience forms of HASH_FIND/HASH_ADD/HASH_DEL */
-#define HASH_FIND_STR(head,findstr,out)                                        \
-    HASH_FIND(hh,head,findstr,strlen(findstr),out)
-#define HASH_ADD_STR(head,strfield,add)                                        \
-    HASH_ADD(hh,head,strfield,strlen(add->strfield),add)
-#define HASH_FIND_INT(head,findint,out)                                        \
-    HASH_FIND(hh,head,findint,sizeof(int),out)
-#define HASH_ADD_INT(head,intfield,add)                                        \
-    HASH_ADD(hh,head,intfield,sizeof(int),add)
-#define HASH_DEL(head,delptr)                                                  \
-    HASH_DELETE(hh,head,delptr)
-
-/* HASH_FSCK checks hash integrity on every add/delete when HASH_DEBUG is defined.
- * This is for uthash developer only; it compiles away if HASH_DEBUG isn't defined.
- */
-#ifdef HASH_DEBUG
-#define HASH_OOPS(...) do { fprintf(stderr,__VA_ARGS__); exit(-1); } while (0)
-#define HASH_FSCK(hh,head)                                                     \
-do {                                                                           \
-    unsigned _bkt_i;                                                           \
-    unsigned _count, _bkt_count;                                               \
-    char *_prev;                                                               \
-    struct UT_hash_handle *_thh;                                               \
-    if (head) {                                                                \
-        _count = 0;                                                            \
-        for( _bkt_i = 0; _bkt_i < (head)->hh.tbl->num_buckets; _bkt_i++) {     \
-            _bkt_count = 0;                                                    \
-            _thh = (head)->hh.tbl->buckets[_bkt_i].hh_head;                    \
-            _prev = NULL;                                                      \
-            while (_thh) {                                                     \
-               if (_prev != (char*)(_thh->hh_prev)) {                          \
-                   HASH_OOPS("invalid hh_prev %p, actual %p\n",                \
-                    _thh->hh_prev, _prev );                                    \
-               }                                                               \
-               _bkt_count++;                                                   \
-               _prev = (char*)(_thh);                                          \
-               _thh = _thh->hh_next;                                           \
-            }                                                                  \
-            _count += _bkt_count;                                              \
-            if ((head)->hh.tbl->buckets[_bkt_i].count !=  _bkt_count) {        \
-               HASH_OOPS("invalid bucket count %d, actual %d\n",               \
-                (head)->hh.tbl->buckets[_bkt_i].count, _bkt_count);            \
-            }                                                                  \
-        }                                                                      \
-        if (_count != (head)->hh.tbl->num_items) {                             \
-            HASH_OOPS("invalid hh item count %d, actual %d\n",                 \
-                (head)->hh.tbl->num_items, _count );                           \
-        }                                                                      \
-        /* traverse hh in app order; check next/prev integrity, count */       \
-        _count = 0;                                                            \
-        _prev = NULL;                                                          \
-        _thh =  &(head)->hh;                                                   \
-        while (_thh) {                                                         \
-           _count++;                                                           \
-           if (_prev !=(char*)(_thh->prev)) {                                  \
-              HASH_OOPS("invalid prev %p, actual %p\n",                        \
-                    _thh->prev, _prev );                                       \
-           }                                                                   \
-           _prev = (char*)ELMT_FROM_HH((head)->hh.tbl, _thh);                  \
-           _thh = ( _thh->next ?  (UT_hash_handle*)((char*)(_thh->next) +      \
-                                  (head)->hh.tbl->hho) : NULL );               \
-        }                                                                      \
-        if (_count != (head)->hh.tbl->num_items) {                             \
-            HASH_OOPS("invalid app item count %d, actual %d\n",                \
-                (head)->hh.tbl->num_items, _count );                           \
-        }                                                                      \
-    }                                                                          \
-} while (0)
-#else
-#define HASH_FSCK(hh,head) 
-#endif
-
-/* When compiled with -DHASH_EMIT_KEYS, length-prefixed keys are emitted to 
- * the descriptor to which this macro is defined for tuning the hash function.
- * The app can #include <unistd.h> to get the prototype for write(2). */
-#ifdef HASH_EMIT_KEYS
-#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)                                 \
-do {                                                                           \
-    unsigned _klen = fieldlen;                                                 \
-    write(HASH_EMIT_KEYS, &_klen, sizeof(_klen));                              \
-    write(HASH_EMIT_KEYS, keyptr, fieldlen);                                   \
-} while (0)
-#else 
-#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)                    
-#endif
-
-/* default to MurmurHash unless overridden e.g. DHASH_FUNCTION=HASH_SAX */
-#ifdef HASH_FUNCTION 
-#define HASH_FCN HASH_FUNCTION
-#else
-#define HASH_FCN HASH_MUR
-#endif
-
-/* The Bernstein hash function, used in Perl prior to v5.6 */
-#define HASH_BER(key,keylen,num_bkts,hashv,bkt)                                \
-do {                                                                           \
-  unsigned _hb_keylen=keylen;                                                  \
-  char *_hb_key=(char*)key;                                                    \
-  (hashv) = 0;                                                                 \
-  while (_hb_keylen--)  { (hashv) = ((hashv) * 33) + *_hb_key++; }             \
-  bkt = (hashv) & (num_bkts-1);                                                \
-} while (0)
-
-
-/* SAX/FNV/OAT/JEN hash functions are macro variants of those listed at 
- * http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx */
-#define HASH_SAX(key,keylen,num_bkts,hashv,bkt)                                \
-do {                                                                           \
-  unsigned _sx_i;                                                              \
-  char *_hs_key=(char*)key;                                                    \
-  hashv = 0;                                                                   \
-  for(_sx_i=0; _sx_i < keylen; _sx_i++)                                        \
-      hashv ^= (hashv << 5) + (hashv >> 2) + _hs_key[_sx_i];                   \
-  bkt = hashv & (num_bkts-1);                                                  \
-} while (0)
-
-#define HASH_FNV(key,keylen,num_bkts,hashv,bkt)                                \
-do {                                                                           \
-  unsigned _fn_i;                                                              \
-  char *_hf_key=(char*)key;                                                    \
-  hashv = 2166136261UL;                                                        \
-  for(_fn_i=0; _fn_i < keylen; _fn_i++)                                        \
-      hashv = (hashv * 16777619) ^ _hf_key[_fn_i];                             \
-  bkt = hashv & (num_bkts-1);                                                  \
-} while(0);
- 
-#define HASH_OAT(key,keylen,num_bkts,hashv,bkt)                                \
-do {                                                                           \
-  unsigned _ho_i;                                                              \
-  char *_ho_key=(char*)key;                                                    \
-  hashv = 0;                                                                   \
-  for(_ho_i=0; _ho_i < keylen; _ho_i++) {                                      \
-      hashv += _ho_key[_ho_i];                                                 \
-      hashv += (hashv << 10);                                                  \
-      hashv ^= (hashv >> 6);                                                   \
-  }                                                                            \
-  hashv += (hashv << 3);                                                       \
-  hashv ^= (hashv >> 11);                                                      \
-  hashv += (hashv << 15);                                                      \
-  bkt = hashv & (num_bkts-1);                                                  \
-} while(0)
-
-#define HASH_JEN_MIX(a,b,c)                                                    \
-do {                                                                           \
-  a -= b; a -= c; a ^= ( c >> 13 );                                            \
-  b -= c; b -= a; b ^= ( a << 8 );                                             \
-  c -= a; c -= b; c ^= ( b >> 13 );                                            \
-  a -= b; a -= c; a ^= ( c >> 12 );                                            \
-  b -= c; b -= a; b ^= ( a << 16 );                                            \
-  c -= a; c -= b; c ^= ( b >> 5 );                                             \
-  a -= b; a -= c; a ^= ( c >> 3 );                                             \
-  b -= c; b -= a; b ^= ( a << 10 );                                            \
-  c -= a; c -= b; c ^= ( b >> 15 );                                            \
-} while (0)
-
-#define HASH_JEN(key,keylen,num_bkts,hashv,bkt)                                \
-do {                                                                           \
-  unsigned _hj_i,_hj_j,_hj_k;                                                  \
-  char *_hj_key=(char*)key;                                                    \
-  hashv = 0xfeedbeef;                                                          \
-  _hj_i = _hj_j = 0x9e3779b9;                                                  \
-  _hj_k = keylen;                                                              \
-  while (_hj_k >= 12) {                                                        \
-    _hj_i +=    (_hj_key[0] + ( (unsigned)_hj_key[1] << 8 )                    \
-        + ( (unsigned)_hj_key[2] << 16 )                                       \
-        + ( (unsigned)_hj_key[3] << 24 ) );                                    \
-    _hj_j +=    (_hj_key[4] + ( (unsigned)_hj_key[5] << 8 )                    \
-        + ( (unsigned)_hj_key[6] << 16 )                                       \
-        + ( (unsigned)_hj_key[7] << 24 ) );                                    \
-    hashv += (_hj_key[8] + ( (unsigned)_hj_key[9] << 8 )                       \
-        + ( (unsigned)_hj_key[10] << 16 )                                      \
-        + ( (unsigned)_hj_key[11] << 24 ) );                                   \
-                                                                               \
-     HASH_JEN_MIX(_hj_i, _hj_j, hashv);                                        \
-                                                                               \
-     _hj_key += 12;                                                            \
-     _hj_k -= 12;                                                              \
-  }                                                                            \
-  hashv += keylen;                                                             \
-  switch ( _hj_k ) {                                                           \
-     case 11: hashv += ( (unsigned)_hj_key[10] << 24 );                        \
-     case 10: hashv += ( (unsigned)_hj_key[9] << 16 );                         \
-     case 9:  hashv += ( (unsigned)_hj_key[8] << 8 );                          \
-     case 8:  _hj_j += ( (unsigned)_hj_key[7] << 24 );                         \
-     case 7:  _hj_j += ( (unsigned)_hj_key[6] << 16 );                         \
-     case 6:  _hj_j += ( (unsigned)_hj_key[5] << 8 );                          \
-     case 5:  _hj_j += _hj_key[4];                                             \
-     case 4:  _hj_i += ( (unsigned)_hj_key[3] << 24 );                         \
-     case 3:  _hj_i += ( (unsigned)_hj_key[2] << 16 );                         \
-     case 2:  _hj_i += ( (unsigned)_hj_key[1] << 8 );                          \
-     case 1:  _hj_i += _hj_key[0];                                             \
-  }                                                                            \
-  HASH_JEN_MIX(_hj_i, _hj_j, hashv);                                           \
-  bkt = hashv & (num_bkts-1);                                                  \
-} while(0)
-
-/* The Paul Hsieh hash function */
-#undef get16bits
-#if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__)           \
-  || defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__)
-#define get16bits(d) (*((const uint16_t *) (d)))
-#endif
-
-#if !defined (get16bits)
-#define get16bits(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8)\
-                       +(uint32_t)(((const uint8_t *)(d))[0]) )
-#endif
-#define HASH_SFH(key,keylen,num_bkts,hashv,bkt)                                \
-do {                                                                           \
-  char *_sfh_key=(char*)key;                                                   \
-  hashv = 0xcafebabe;                                                          \
-  uint32_t _sfh_tmp, _sfh_len = keylen;                                        \
-                                                                               \
-  int _sfh_rem = _sfh_len & 3;                                                 \
-  _sfh_len >>= 2;                                                              \
-                                                                               \
-  /* Main loop */                                                              \
-  for (;_sfh_len > 0; _sfh_len--) {                                            \
-    hashv    += get16bits (_sfh_key);                                          \
-    _sfh_tmp       = (get16bits (_sfh_key+2) << 11) ^ hashv;                   \
-    hashv     = (hashv << 16) ^ _sfh_tmp;                                      \
-    _sfh_key += 2*sizeof (uint16_t);                                           \
-    hashv    += hashv >> 11;                                                   \
-  }                                                                            \
-                                                                               \
-  /* Handle end cases */                                                       \
-  switch (_sfh_rem) {                                                          \
-    case 3: hashv += get16bits (_sfh_key);                                     \
-            hashv ^= hashv << 16;                                              \
-            hashv ^= _sfh_key[sizeof (uint16_t)] << 18;                        \
-            hashv += hashv >> 11;                                              \
-            break;                                                             \
-    case 2: hashv += get16bits (_sfh_key);                                     \
-            hashv ^= hashv << 11;                                              \
-            hashv += hashv >> 17;                                              \
-            break;                                                             \
-    case 1: hashv += *_sfh_key;                                                \
-            hashv ^= hashv << 10;                                              \
-            hashv += hashv >> 1;                                               \
-  }                                                                            \
-                                                                               \
-    /* Force "avalanching" of final 127 bits */                                \
-    hashv ^= hashv << 3;                                                       \
-    hashv += hashv >> 5;                                                       \
-    hashv ^= hashv << 4;                                                       \
-    hashv += hashv >> 17;                                                      \
-    hashv ^= hashv << 25;                                                      \
-    hashv += hashv >> 6;                                                       \
-    bkt = hashv & (num_bkts-1);                                                \
-} while(0);
-
-/* Austin Appleby's MurmurHash */
-#define HASH_MUR(key,keylen,num_bkts,hashv,bkt)                                \
-do {                                                                           \
-  const unsigned int _mur_m = 0x5bd1e995;                                      \
-  const int _mur_r = 24;                                                       \
-  hashv = 0xcafebabe ^ keylen;                                                 \
-  char *_mur_key = (char *)key;                                                \
-  uint32_t _mur_tmp, _mur_len = keylen;                                        \
-                                                                               \
-  for (;_mur_len >= 4; _mur_len-=4) {                                          \
-    _mur_tmp = *(uint32_t *)_mur_key;                                          \
-    _mur_tmp *= _mur_m;                                                        \
-    _mur_tmp ^= _mur_tmp >> _mur_r;                                            \
-    _mur_tmp *= _mur_m;                                                        \
-    hashv *= _mur_m;                                                           \
-    hashv ^= _mur_tmp;                                                         \
-    _mur_key += 4;                                                             \
-  }                                                                            \
-                                                                               \
-  switch(_mur_len)                                                             \
-  {                                                                            \
-    case 3: hashv ^= _mur_key[2] << 16;                                        \
-    case 2: hashv ^= _mur_key[1] << 8;                                         \
-    case 1: hashv ^= _mur_key[0];                                              \
-            hashv *= _mur_m;                                                   \
-  };                                                                           \
-                                                                               \
-  hashv ^= hashv >> 13;                                                        \
-  hashv *= _mur_m;                                                             \
-  hashv ^= hashv >> 15;                                                        \
-                                                                               \
-  bkt = hashv & (num_bkts-1);                                                  \
-} while(0)
-
-/* key comparison function; return 0 if keys equal */
-#define HASH_KEYCMP(a,b,len) memcmp(a,b,len) 
-
-/* iterate over items in a known bucket to find desired item */
-#define HASH_FIND_IN_BKT(tbl,hh,head,keyptr,keylen_in,out)                     \
-out = TYPEOF(out)((head.hh_head) ? ELMT_FROM_HH(tbl,head.hh_head) : NULL);     \
-while (out) {                                                                  \
-    if (out->hh.keylen == keylen_in) {                                         \
-        if ((HASH_KEYCMP(out->hh.key,keyptr,keylen_in)) == 0) break;           \
-    }                                                                          \
-    out= TYPEOF(out)((out->hh.hh_next) ?                                       \
-                     ELMT_FROM_HH(tbl,out->hh.hh_next) : NULL);                \
-}
-
-/* add an item to a bucket  */
-#define HASH_ADD_TO_BKT(head,addhh)                                            \
-do {                                                                           \
- head.count++;                                                                 \
- (addhh)->hh_next = head.hh_head;                                              \
- (addhh)->hh_prev = NULL;                                                      \
- if (head.hh_head) { (head).hh_head->hh_prev = (addhh); }                      \
- (head).hh_head=addhh;                                                         \
- if (head.count >= ((head.expand_mult+1) * HASH_BKT_CAPACITY_THRESH)           \
-     && (addhh)->tbl->noexpand != 1) {                                         \
-       HASH_EXPAND_BUCKETS((addhh)->tbl);                                      \
- }                                                                             \
-} while(0)
-
-/* remove an item from a given bucket */
-#define HASH_DEL_IN_BKT(hh,head,hh_del)                                        \
-    (head).count--;                                                            \
-    if ((head).hh_head == hh_del) {                                            \
-      (head).hh_head = hh_del->hh_next;                                        \
-    }                                                                          \
-    if (hh_del->hh_prev) {                                                     \
-        hh_del->hh_prev->hh_next = hh_del->hh_next;                            \
-    }                                                                          \
-    if (hh_del->hh_next) {                                                     \
-        hh_del->hh_next->hh_prev = hh_del->hh_prev;                            \
-    }                                                                
-
-/* Bucket expansion has the effect of doubling the number of buckets
- * and redistributing the items into the new buckets. Ideally the
- * items will distribute more or less evenly into the new buckets
- * (the extent to which this is true is a measure of the quality of
- * the hash function as it applies to the key domain). 
- * 
- * With the items distributed into more buckets, the chain length
- * (item count) in each bucket is reduced. Thus by expanding buckets
- * the hash keeps a bound on the chain length. This bounded chain 
- * length is the essence of how a hash provides constant time lookup.
- * 
- * The calculation of tbl->ideal_chain_maxlen below deserves some
- * explanation. First, keep in mind that we're calculating the ideal
- * maximum chain length based on the *new* (doubled) bucket count.
- * In fractions this is just n/b (n=number of items,b=new num buckets).
- * Since the ideal chain length is an integer, we want to calculate 
- * ceil(n/b). We don't depend on floating point arithmetic in this
- * hash, so to calculate ceil(n/b) with integers we could write
- * 
- *      ceil(n/b) = (n/b) + ((n%b)?1:0)
- * 
- * and in fact a previous version of this hash did just that.
- * But now we have improved things a bit by recognizing that b is
- * always a power of two. We keep its base 2 log handy (call it lb),
- * so now we can write this with a bit shift and logical AND:
- * 
- *      ceil(n/b) = (n>>lb) + ( (n & (b-1)) ? 1:0)
- * 
- */
-#define HASH_EXPAND_BUCKETS(tbl)                                               \
-do {                                                                           \
-    unsigned _he_bkt;                                                          \
-    unsigned _he_bkt_i;                                                        \
-    struct UT_hash_handle *_he_thh, *_he_hh_nxt;                               \
-    UT_hash_bucket *_he_new_buckets, *_he_newbkt;                              \
-    _he_new_buckets = (UT_hash_bucket*)uthash_bkt_malloc(                      \
-             2 * tbl->num_buckets * sizeof(struct UT_hash_bucket));            \
-    if (!_he_new_buckets) { uthash_fatal( "out of memory"); }                  \
-    memset(_he_new_buckets, 0,                                                 \
-            2 * tbl->num_buckets * sizeof(struct UT_hash_bucket));             \
-    tbl->ideal_chain_maxlen =                                                  \
-       (tbl->num_items >> (tbl->log2_num_buckets+1)) +                         \
-       ((tbl->num_items & ((tbl->num_buckets*2)-1)) ? 1 : 0);                  \
-    tbl->nonideal_items = 0;                                                   \
-    for(_he_bkt_i = 0; _he_bkt_i < tbl->num_buckets; _he_bkt_i++)              \
-    {                                                                          \
-        _he_thh = tbl->buckets[ _he_bkt_i ].hh_head;                           \
-        while (_he_thh) {                                                      \
-           _he_hh_nxt = _he_thh->hh_next;                                      \
-           HASH_TO_BKT( _he_thh->hashv, tbl->num_buckets*2, _he_bkt);          \
-           _he_newbkt = &(_he_new_buckets[ _he_bkt ]);                         \
-           if (++(_he_newbkt->count) > tbl->ideal_chain_maxlen) {              \
-             tbl->nonideal_items++;                                            \
-             _he_newbkt->expand_mult = _he_newbkt->count /                     \
-                                        tbl->ideal_chain_maxlen;               \
-           }                                                                   \
-           _he_thh->hh_prev = NULL;                                            \
-           _he_thh->hh_next = _he_newbkt->hh_head;                             \
-           if (_he_newbkt->hh_head) _he_newbkt->hh_head->hh_prev =             \
-                _he_thh;                                                       \
-           _he_newbkt->hh_head = _he_thh;                                      \
-           _he_thh = _he_hh_nxt;                                               \
-        }                                                                      \
-    }                                                                          \
-    tbl->num_buckets *= 2;                                                     \
-    tbl->log2_num_buckets++;                                                   \
-    uthash_bkt_free( tbl->buckets );                                           \
-    tbl->buckets = _he_new_buckets;                                            \
-    tbl->ineff_expands = (tbl->nonideal_items > (tbl->num_items >> 1)) ?       \
-        (tbl->ineff_expands+1) : 0;                                            \
-    if (tbl->ineff_expands > 1) {                                              \
-        tbl->noexpand=1;                                                       \
-        uthash_noexpand_fyi(tbl);                                              \
-    }                                                                          \
-    uthash_expand_fyi(tbl);                                                    \
-} while(0)
-
-
-/* This is an adaptation of Simon Tatham's O(n log(n)) mergesort */
-/* Note that HASH_SORT assumes the hash handle name to be hh. 
- * HASH_SRT was added to allow the hash handle name to be passed in. */
-#define HASH_SORT(head,cmpfcn) HASH_SRT(hh,head,cmpfcn)
-#define HASH_SRT(hh,head,cmpfcn)                                               \
-do {                                                                           \
-  unsigned _hs_i;                                                              \
-  unsigned _hs_looping,_hs_nmerges,_hs_insize,_hs_psize,_hs_qsize;             \
-  struct UT_hash_handle *_hs_p, *_hs_q, *_hs_e, *_hs_list, *_hs_tail;          \
-  if (head) {                                                                  \
-      _hs_insize = 1;                                                          \
-      _hs_looping = 1;                                                         \
-      _hs_list = &((head)->hh);                                                \
-      while (_hs_looping) {                                                    \
-          _hs_p = _hs_list;                                                    \
-          _hs_list = NULL;                                                     \
-          _hs_tail = NULL;                                                     \
-          _hs_nmerges = 0;                                                     \
-          while (_hs_p) {                                                      \
-              _hs_nmerges++;                                                   \
-              _hs_q = _hs_p;                                                   \
-              _hs_psize = 0;                                                   \
-              for ( _hs_i = 0; _hs_i  < _hs_insize; _hs_i++ ) {                \
-                  _hs_psize++;                                                 \
-                  _hs_q = (UT_hash_handle*)((_hs_q->next) ?                    \
-                          ((void*)((char*)(_hs_q->next) +                      \
-                          (head)->hh.tbl->hho)) : NULL);                       \
-                  if (! (_hs_q) ) break;                                       \
-              }                                                                \
-              _hs_qsize = _hs_insize;                                          \
-              while ((_hs_psize > 0) || ((_hs_qsize > 0) && _hs_q )) {         \
-                  if (_hs_psize == 0) {                                        \
-                      _hs_e = _hs_q;                                           \
-                      _hs_q = (UT_hash_handle*)((_hs_q->next) ?                \
-                              ((void*)((char*)(_hs_q->next) +                  \
-                              (head)->hh.tbl->hho)) : NULL);                   \
-                      _hs_qsize--;                                             \
-                  } else if ( (_hs_qsize == 0) || !(_hs_q) ) {                 \
-                      _hs_e = _hs_p;                                           \
-                      _hs_p = (UT_hash_handle*)((_hs_p->next) ?                \
-                              ((void*)((char*)(_hs_p->next) +                  \
-                              (head)->hh.tbl->hho)) : NULL);                   \
-                      _hs_psize--;                                             \
-                  } else if ((                                                 \
-                      cmpfcn(TYPEOF(head)(ELMT_FROM_HH((head)->hh.tbl,_hs_p)), \
-                            TYPEOF(head)(ELMT_FROM_HH((head)->hh.tbl,_hs_q)))  \
-                             ) <= 0) {                                         \
-                      _hs_e = _hs_p;                                           \
-                      _hs_p = (UT_hash_handle*)((_hs_p->next) ?                \
-                              ((void*)((char*)(_hs_p->next) +                  \
-                              (head)->hh.tbl->hho)) : NULL);                   \
-                      _hs_psize--;                                             \
-                  } else {                                                     \
-                      _hs_e = _hs_q;                                           \
-                      _hs_q = (UT_hash_handle*)((_hs_q->next) ?                \
-                              ((void*)((char*)(_hs_q->next) +                  \
-                              (head)->hh.tbl->hho)) : NULL);                   \
-                      _hs_qsize--;                                             \
-                  }                                                            \
-                  if ( _hs_tail ) {                                            \
-                      _hs_tail->next = ((_hs_e) ?                              \
-                            ELMT_FROM_HH((head)->hh.tbl,_hs_e) : NULL);        \
-                  } else {                                                     \
-                      _hs_list = _hs_e;                                        \
-                  }                                                            \
-                  _hs_e->prev = ((_hs_tail) ?                                  \
-                     ELMT_FROM_HH((head)->hh.tbl,_hs_tail) : NULL);            \
-                  _hs_tail = _hs_e;                                            \
-              }                                                                \
-              _hs_p = _hs_q;                                                   \
-          }                                                                    \
-          _hs_tail->next = NULL;                                               \
-          if ( _hs_nmerges <= 1 ) {                                            \
-              _hs_looping=0;                                                   \
-              (head)->hh.tbl->tail = _hs_tail;                                 \
-              (head) = TYPEOF(head)ELMT_FROM_HH((head)->hh.tbl, _hs_list);     \
-          }                                                                    \
-          _hs_insize *= 2;                                                     \
-      }                                                                        \
-      HASH_FSCK(hh,head);                                                      \
- }                                                                             \
-} while (0)
-
-/* This function selects items from one hash into another hash. 
- * The end result is that the selected items have dual presence 
- * in both hashes. There is no copy of the items made; rather 
- * they are added into the new hash through a secondary hash 
- * hash handle that must be present in the structure. */
-#define HASH_SELECT(hh_dst, dst, hh_src, src, cond)                            \
-do {                                                                           \
-  unsigned _src_bkt, _dst_bkt;                                                 \
-  void *_last_elt=NULL, *_elt;                                                 \
-  UT_hash_handle *_src_hh, *_dst_hh, *_last_elt_hh=NULL;                       \
-  ptrdiff_t _dst_hho = ((char*)(&(dst)->hh_dst) - (char*)(dst));               \
-  if (src) {                                                                   \
-    for(_src_bkt=0; _src_bkt < (src)->hh_src.tbl->num_buckets; _src_bkt++) {   \
-      for(_src_hh = (src)->hh_src.tbl->buckets[_src_bkt].hh_head;              \
-          _src_hh;                                                             \
-          _src_hh = _src_hh->hh_next) {                                        \
-          _elt = ELMT_FROM_HH((src)->hh_src.tbl, _src_hh);                     \
-          if (cond(_elt)) {                                                    \
-            _dst_hh = (UT_hash_handle*)(((char*)_elt) + _dst_hho);             \
-            _dst_hh->key = _src_hh->key;                                       \
-            _dst_hh->keylen = _src_hh->keylen;                                 \
-            _dst_hh->hashv = _src_hh->hashv;                                   \
-            _dst_hh->prev = _last_elt;                                         \
-            _dst_hh->next = NULL;                                              \
-            if (_last_elt_hh) { _last_elt_hh->next = _elt; }                   \
-            if (!dst) {                                                        \
-              dst = TYPEOF(dst)_elt;                                           \
-              HASH_MAKE_TABLE(hh_dst,dst);                                     \
-            } else {                                                           \
-              _dst_hh->tbl = (dst)->hh_dst.tbl;                                \
-            }                                                                  \
-            HASH_TO_BKT(_dst_hh->hashv, _dst_hh->tbl->num_buckets, _dst_bkt);  \
-            HASH_ADD_TO_BKT(_dst_hh->tbl->buckets[_dst_bkt],_dst_hh);          \
-            (dst)->hh_dst.tbl->num_items++;                                    \
-            _last_elt = _elt;                                                  \
-            _last_elt_hh = _dst_hh;                                            \
-          }                                                                    \
-      }                                                                        \
-    }                                                                          \
-  }                                                                            \
-  HASH_FSCK(hh_dst,dst);                                                       \
-} while (0)
-
-#define HASH_CLEAR(hh,head)                                                    \
-do {                                                                           \
-  if (head) {                                                                  \
-    uthash_bkt_free((head)->hh.tbl->buckets );                                 \
-    uthash_tbl_free((head)->hh.tbl);                                           \
-    (head)=NULL;                                                               \
-  }                                                                            \
-} while(0)
-
-/* obtain a count of items in the hash */
-#define HASH_COUNT(head) HASH_CNT(hh,head) 
-#define HASH_CNT(hh,head) (head?(head->hh.tbl->num_items):0)
-
-typedef struct UT_hash_bucket {
-   struct UT_hash_handle *hh_head;
-   unsigned count;
-
-   /* expand_mult is normally set to 0. In this situation, the max chain length
-    * threshold is enforced at its default value, HASH_BKT_CAPACITY_THRESH. (If
-    * the bucket's chain exceeds this length, bucket expansion is triggered). 
-    * However, setting expand_mult to a non-zero value delays bucket expansion
-    * (that would be triggered by additions to this particular bucket)
-    * until its chain length reaches a *multiple* of HASH_BKT_CAPACITY_THRESH.
-    * (The multiplier is simply expand_mult+1). The whole idea of this
-    * multiplier is to reduce bucket expansions, since they are expensive, in
-    * situations where we know that a particular bucket tends to be overused.
-    * It is better to let its chain length grow to a longer yet-still-bounded
-    * value, than to do an O(n) bucket expansion too often. 
-    */
-   unsigned expand_mult;
-
-} UT_hash_bucket;
-
-typedef struct UT_hash_table {
-   UT_hash_bucket *buckets;
-   unsigned num_buckets, log2_num_buckets;
-   unsigned num_items;
-   struct UT_hash_handle *tail; /* tail hh in app order, for fast append    */
-   ptrdiff_t hho; /* hash handle offset (byte pos of hash handle in element */
-
-   /* in an ideal situation (all buckets used equally), no bucket would have
-    * more than ceil(#items/#buckets) items. that's the ideal chain length. */
-   unsigned ideal_chain_maxlen;
-
-   /* nonideal_items is the number of items in the hash whose chain position
-    * exceeds the ideal chain maxlen. these items pay the penalty for an uneven
-    * hash distribution; reaching them in a chain traversal takes >ideal steps */
-   unsigned nonideal_items;
-
-   /* ineffective expands occur when a bucket doubling was performed, but 
-    * afterward, more than half the items in the hash had nonideal chain
-    * positions. If this happens on two consecutive expansions we inhibit any
-    * further expansion, as it's not helping; this happens when the hash
-    * function isn't a good fit for the key domain. When expansion is inhibited
-    * the hash will still work, albeit no longer in constant time. */
-   unsigned ineff_expands, noexpand;
-
-
-} UT_hash_table;
-
-
-typedef struct UT_hash_handle {
-   struct UT_hash_table *tbl;
-   void *prev;                       /* prev element in app order      */
-   void *next;                       /* next element in app order      */
-   struct UT_hash_handle *hh_prev;   /* previous hh in bucket order    */
-   struct UT_hash_handle *hh_next;   /* next hh in bucket order        */
-   void *key;                        /* ptr to enclosing struct's key  */
-   unsigned keylen;                  /* enclosing struct's key len     */
-   unsigned hashv;                   /* result of hash-fcn(key)        */
-} UT_hash_handle;
-
-#endif /* UTHASH_H */
diff --git a/src/rt/uthash/utlist.h b/src/rt/uthash/utlist.h
deleted file mode 100644
index a33615e1ba0..00000000000
--- a/src/rt/uthash/utlist.h
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
-Copyright (c) 2007-2009, Troy D. Hanson
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef UTLIST_H
-#define UTLIST_H
-
-#define UTLIST_VERSION 1.0
-
-/* C++ requires extra stringent casting */
-#if defined __cplusplus
-#define LTYPEOF(x) (typeof(x))
-#else
-#define LTYPEOF(x)
-#endif
-/* 
- * This file contains macros to manipulate singly and doubly-linked lists.
- *
- * 1. LL_ macros:  singly-linked lists.
- * 2. DL_ macros:  doubly-linked lists.
- * 3. CDL_ macros: circular doubly-linked lists.
- *
- * To use singly-linked lists, your structure must have a "next" pointer.
- * To use doubly-linked lists, your structure must "prev" and "next" pointers.
- * Either way, the pointer to the head of the list must be initialized to NULL.
- * 
- * ----------------.EXAMPLE -------------------------
- * struct item {
- *      int id;
- *      struct item *prev, *next;
- * }
- *
- * struct item *list = NULL:
- *
- * int main() {
- *      struct item *item;
- *      ... allocate and populate item ...
- *      DL_APPEND(list, item);
- * }
- * --------------------------------------------------
- *
- * For doubly-linked lists, the append and delete macros are O(1)
- * For singly-linked lists, append and delete are O(n) but prepend is O(1)
- * The sort macro is O(n log(n)) for all types of single/double/circular lists.
- */
-
-/******************************************************************************
- * The SORT macros                                                            *
- *****************************************************************************/
-#define LL_SORT(l,cmp)                                                           \
- LISTSORT(l,0,0,FIELD_OFFSET(l,next),cmp)
-#define DL_SORT(l,cmp)                                                           \
- LISTSORT(l,0,FIELD_OFFSET(l,prev),FIELD_OFFSET(l,next),cmp)
-#define CDL_SORT(l,cmp)                                                          \
- LISTSORT(l,1,FIELD_OFFSET(l,prev),FIELD_OFFSET(l,next),cmp)
-
-/* The macros can't assume or cast to the caller's list element type. So we use
- * a couple tricks when we need to deal with those element's prev/next pointers.
- * Basically we use char pointer arithmetic to get those field offsets. */
-#define FIELD_OFFSET(ptr,field) ((char*)&((ptr)->field) - (char*)(ptr))
-#define LNEXT(e,no) (*(char**)(((char*)e) + no))
-#define LPREV(e,po) (*(char**)(((char*)e) + po))
-/******************************************************************************
- * The LISTSORT macro is an adaptation of Simon Tatham's O(n log(n)) mergesort*
- * Unwieldy variable names used here to avoid shadowing passed-in variables.  *
- *****************************************************************************/
-#define LISTSORT(list, is_circular, po, no, cmp)                                 \
-do {                                                                             \
-  void *_ls_p, *_ls_q, *_ls_e, *_ls_tail, *_ls_oldhead;                          \
-  int _ls_insize, _ls_nmerges, _ls_psize, _ls_qsize, _ls_i, _ls_looping;         \
-  int _ls_is_double = (po==0) ? 0 : 1;                                           \
-  if (list) {                                                                    \
-    _ls_insize = 1;                                                              \
-    _ls_looping = 1;                                                             \
-    while (_ls_looping) {                                                        \
-      _ls_p = list;                                                              \
-      _ls_oldhead = list;                                                        \
-      list = NULL;                                                               \
-      _ls_tail = NULL;                                                           \
-      _ls_nmerges = 0;                                                           \
-      while (_ls_p) {                                                            \
-        _ls_nmerges++;                                                           \
-        _ls_q = _ls_p;                                                           \
-        _ls_psize = 0;                                                           \
-        for (_ls_i = 0; _ls_i < _ls_insize; _ls_i++) {                           \
-          _ls_psize++;                                                           \
-          if (is_circular)  {                                                    \
-            _ls_q = ((LNEXT(_ls_q,no) == _ls_oldhead) ? NULL : LNEXT(_ls_q,no)); \
-          } else  {                                                              \
-            _ls_q = LNEXT(_ls_q,no);                                             \
-          }                                                                      \
-          if (!_ls_q) break;                                                     \
-        }                                                                        \
-        _ls_qsize = _ls_insize;                                                  \
-        while (_ls_psize > 0 || (_ls_qsize > 0 && _ls_q)) {                      \
-          if (_ls_psize == 0) {                                                  \
-            _ls_e = _ls_q; _ls_q = LNEXT(_ls_q,no); _ls_qsize--;                 \
-            if (is_circular && _ls_q == _ls_oldhead) { _ls_q = NULL; }           \
-          } else if (_ls_qsize == 0 || !_ls_q) {                                 \
-            _ls_e = _ls_p; _ls_p = LNEXT(_ls_p,no); _ls_psize--;                 \
-            if (is_circular && (_ls_p == _ls_oldhead)) { _ls_p = NULL; }         \
-          } else if (cmp(LTYPEOF(list)_ls_p,LTYPEOF(list)_ls_q) <= 0) {          \
-            _ls_e = _ls_p; _ls_p = LNEXT(_ls_p,no); _ls_psize--;                 \
-            if (is_circular && (_ls_p == _ls_oldhead)) { _ls_p = NULL; }         \
-          } else {                                                               \
-            _ls_e = _ls_q; _ls_q = LNEXT(_ls_q,no); _ls_qsize--;                 \
-            if (is_circular && (_ls_q == _ls_oldhead)) { _ls_q = NULL; }         \
-          }                                                                      \
-          if (_ls_tail) {                                                        \
-            LNEXT(_ls_tail,no) = (char*)_ls_e;                                   \
-          } else {                                                               \
-            list = LTYPEOF(list)_ls_e;                                           \
-          }                                                                      \
-          if (_ls_is_double) {                                                   \
-            LPREV(_ls_e,po) = (char*)_ls_tail;                                   \
-          }                                                                      \
-          _ls_tail = _ls_e;                                                      \
-        }                                                                        \
-        _ls_p = _ls_q;                                                           \
-      }                                                                          \
-      if (is_circular) {                                                         \
-        LNEXT(_ls_tail,no) = (char*)list;                                        \
-        if (_ls_is_double) {                                                     \
-          LPREV(list,po) = (char*)_ls_tail;                                      \
-        }                                                                        \
-      } else  {                                                                  \
-        LNEXT(_ls_tail,no) = NULL;                                               \
-      }                                                                          \
-      if (_ls_nmerges <= 1) {                                                    \
-        _ls_looping=0;                                                           \
-      }                                                                          \
-      _ls_insize *= 2;                                                           \
-    }                                                                            \
-  }                                                                              \
-} while (0)
-
-/******************************************************************************
- * singly linked list macros (non-circular)                                   *
- *****************************************************************************/
-#define LL_PREPEND(head,add)                                                     \
-do {                                                                             \
-  (add)->next = head;                                                            \
-  head = add;                                                                    \
-} while (0)
-
-#define LL_APPEND(head,add)                                                      \
-do {                                                                             \
-  (add)->next=NULL;                                                              \
-  if (head) {                                                                    \
-    char *_lla_el = (char*)(head);                                               \
-    unsigned _lla_no = FIELD_OFFSET(head,next);                                  \
-    while (LNEXT(_lla_el,_lla_no)) { _lla_el = LNEXT(_lla_el,_lla_no); }         \
-    LNEXT(_lla_el,_lla_no)=(char*)(add);                                         \
-  } else {                                                                       \
-    (head)=(add);                                                                \
-  }                                                                              \
-} while (0)
-
-#define LL_DELETE(head,del)                                                      \
-do {                                                                             \
-  if ((head) == (del)) {                                                         \
-    (head)=(head)->next;                                                         \
-  } else {                                                                       \
-    char *_lld_el = (char*)(head);                                               \
-    unsigned _lld_no = FIELD_OFFSET(head,next);                                  \
-    while (LNEXT(_lld_el,_lld_no) && (LNEXT(_lld_el,_lld_no) != (char*)(del))) { \
-      _lld_el = LNEXT(_lld_el,_lld_no);                                          \
-    }                                                                            \
-    if (LNEXT(_lld_el,_lld_no)) {                                                \
-      LNEXT(_lld_el,_lld_no) = (char*)((del)->next);                             \
-    }                                                                            \
-  }                                                                              \
-} while (0)
-
-#define LL_FOREACH(head,el)                                                      \
-    for(el=head;el;el=el->next)
-
-/******************************************************************************
- * doubly linked list macros (non-circular)                                   *
- *****************************************************************************/
-#define DL_PREPEND(head,add)                                                     \
-do {                                                                             \
- (add)->next = head;                                                             \
- if (head) {                                                                     \
-   (add)->prev = (head)->prev;                                                   \
-   (head)->prev = (add);                                                         \
- } else {                                                                        \
-   (add)->prev = (add);                                                          \
- }                                                                               \
- (head) = (add);                                                                 \
-} while (0)
-
-#define DL_APPEND(head,add)                                                      \
-do {                                                                             \
-  if (head) {                                                                    \
-      (add)->prev = (head)->prev;                                                \
-      (head)->prev->next = (add);                                                \
-      (head)->prev = (add);                                                      \
-      (add)->next = NULL;                                                        \
-  } else {                                                                       \
-      (head)=(add);                                                              \
-      (head)->prev = (head);                                                     \
-      (head)->next = NULL;                                                       \
-  }                                                                              \
-} while (0);
-
-#define DL_DELETE(head,del)                                                      \
-do {                                                                             \
-  if ((del)->prev == (del)) {                                                    \
-      (head)=NULL;                                                               \
-  } else if ((del)==(head)) {                                                    \
-      (del)->next->prev = (del)->prev;                                           \
-      (head) = (del)->next;                                                      \
-  } else {                                                                       \
-      (del)->prev->next = (del)->next;                                           \
-      if ((del)->next) {                                                         \
-          (del)->next->prev = (del)->prev;                                       \
-      } else {                                                                   \
-          (head)->prev = (del)->prev;                                            \
-      }                                                                          \
-  }                                                                              \
-} while (0);
-
-
-#define DL_FOREACH(head,el)                                                      \
-    for(el=head;el;el=el->next)
-
-/******************************************************************************
- * circular doubly linked list macros                                         *
- *****************************************************************************/
-#define CDL_PREPEND(head,add)                                                    \
-do {                                                                             \
- if (head) {                                                                     \
-   (add)->prev = (head)->prev;                                                   \
-   (add)->next = (head);                                                         \
-   (head)->prev = (add);                                                         \
-   (add)->prev->next = (add);                                                    \
- } else {                                                                        \
-   (add)->prev = (add);                                                          \
-   (add)->next = (add);                                                          \
- }                                                                               \
-(head)=(add);                                                                    \
-} while (0)
-
-#define CDL_DELETE(head,del)                                                     \
-do {                                                                             \
-  if ( ((head)==(del)) && ((head)->next == (head))) {                            \
-      (head) = 0L;                                                               \
-  } else {                                                                       \
-     (del)->next->prev = (del)->prev;                                            \
-     (del)->prev->next = (del)->next;                                            \
-     if ((del) == (head)) (head)=(del)->next;                                    \
-  }                                                                              \
-} while (0);
-
-#define CDL_FOREACH(head,el)                                                     \
-    for(el=head;el;el= (el->next==head ? 0L : el->next)) 
-
-
-#endif /* UTLIST_H */
-
diff --git a/src/rt/util/hash_map.h b/src/rt/util/hash_map.h
deleted file mode 100644
index e5bef45c1c3..00000000000
--- a/src/rt/util/hash_map.h
+++ /dev/null
@@ -1,207 +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.
-
-/**
- * A C++ wrapper around uthash.
- */
-
-#ifndef HASH_MAP
-#define HASH_MAP
-
-#include <assert.h>
-#include "../uthash/uthash.h"
-
-template<typename K, typename V> class hash_map {
-    struct map_entry {
-        K key;
-        V value;
-        UT_hash_handle hh;
-    };
-    map_entry * _head;
-private:
-    // private and left undefined to disable copying
-    hash_map(const hash_map& rhs);
-    hash_map& operator=(const hash_map& rhs);
-public:
-    hash_map();
-    ~hash_map();
-
-    /**
-     * Associates a value with the specified key in this hash map.
-     * If a mapping already exists the old value is replaced.
-     *
-     * returns:
-     * true if the mapping was successfully created and false otherwise.
-     */
-    bool put(K key, V value);
-
-    /**
-     * Updates the value associated with the specified key in this hash map.
-     *
-     * returns:
-     * true if the value was updated, or false if the key was not found.
-     */
-    bool set(K key, V value);
-
-    /**
-     * Gets the value associated with the specified key in this hash map.
-     *
-     * returns:
-     * true if the value was found and updates the specified *value parameter
-     * with the associated value, or false otherwise.
-     */
-    bool get(K key, V *value) const;
-
-    /**
-     * Removes a key-value pair from this hash map.
-     *
-     * returns:
-     * true if a key-value pair exists and updates the specified
-     * *key and *value parameters, or false otherwise.
-     */
-    bool pop(K *key, V *value);
-
-    /**
-     * Checks if the specified key exists in this hash map.
-     *
-     * returns:
-     * true if the specified key exists in this hash map, or false otherwise.
-     */
-    bool contains(K key) const;
-
-    /**
-     * Removes the value associated with the specified key from this hash map.
-     *
-     * returns:
-     * true if the specified key exists and updates the specified *old_value
-     * parameter with the associated value, or false otherwise.
-     */
-    bool remove(K key, V *old_value);
-    bool remove(K key);
-
-    /**
-     * Returns the number of key-value pairs in this hash map.
-     */
-    size_t count() const;
-
-    bool is_empty() const {
-        return count() == 0;
-    }
-
-    /**
-     * Clears all the key-value pairs in this hash map.
-     *
-     * returns:
-     * the number of deleted key-value pairs.
-     */
-    size_t clear();
-};
-
-template<typename K, typename V>
-hash_map<K,V>::hash_map() {
-    _head = NULL;
-}
-
-template<typename K, typename V>
-hash_map<K,V>::~hash_map() {
-    clear();
-}
-
-template<typename K, typename V> bool
-hash_map<K,V>::put(K key, V value) {
-    if (contains(key)) {
-        return set(key, value);
-    }
-    map_entry *entry = (map_entry *) malloc(sizeof(map_entry));
-    entry->key = key;
-    entry->value = value;
-    HASH_ADD(hh, _head, key, sizeof(K), entry);
-    return true;
-}
-
-template<typename K, typename V> bool
-hash_map<K,V>::get(K key, V *value) const {
-    map_entry *entry = NULL;
-    HASH_FIND(hh, _head, &key, sizeof(K), entry);
-    if (entry == NULL) {
-        return false;
-    }
-    *value = entry->value;
-    return true;
-}
-
-template<typename K, typename V> bool
-hash_map<K,V>::set(K key, V value) {
-    map_entry *entry = NULL;
-    HASH_FIND(hh, _head, &key, sizeof(K), entry);
-    if (entry == NULL) {
-        return false;
-    }
-    entry->value = value;
-    return true;
-}
-
-template<typename K, typename V> bool
-hash_map<K,V>::contains(K key) const {
-    V value;
-    return get(key, &value);
-}
-
-template<typename K, typename V> bool
-hash_map<K,V>::remove(K key, V *old_value) {
-    map_entry *entry = NULL;
-    HASH_FIND(hh, _head, &key, sizeof(K), entry);
-    if (entry == NULL) {
-        return false;
-    }
-    *old_value = entry->value;
-    HASH_DEL(_head, entry);
-    free(entry);
-    return true;
-}
-
-template<typename K, typename V> bool
-hash_map<K,V>::pop(K *key, V *value) {
-    if (is_empty()) {
-        return false;
-    }
-    map_entry *entry = _head;
-    HASH_DEL(_head, entry);
-    *key = entry->key;
-    *value = entry->value;
-    free(entry);
-    return true;
-}
-
-template<typename K, typename V> bool
-hash_map<K,V>::remove(K key) {
-    V old_value;
-    return remove(key, &old_value);
-}
-
-template<typename K, typename V> size_t
-hash_map<K,V>::count() const {
-    return HASH_CNT(hh, _head);
-}
-
-template<typename K, typename V> size_t
-hash_map<K,V>::clear() {
-    size_t deleted_entries = 0;
-    while (_head != NULL) {
-        map_entry *entry = _head;
-        HASH_DEL(_head, entry);
-        free(entry);
-        deleted_entries ++;
-    }
-    assert(count() == 0);
-    return deleted_entries;
-}
-
-#endif /* HASH_MAP */