---

yaml
---
r: 13526
b: refs/heads/master
c: 2b70cbc
h: refs/heads/master
v: v3

Author: msullivan

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f0d8e978a94efe228e2ce9ca89bb4044be040c04
+refs/heads/master: 2b70cbc992fbeca0707a2200f730ea32af7e162e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/rust_shape.h

@@ -492,13 +492,9 @@ ctxt<T>::walk_res0() {
         reinterpret_cast<const rust_fn **>(tables->resources);
     const rust_fn *dtor = resources[dtor_offset];
 
-    // Read in the resource type parameters, but ignore them.
-    // TODO: remove after snapshot
-    uint16_t n_ty_params = get_u16_bump(sp);
-    for (uint16_t i = 0; i < n_ty_params; i++) {
-        uint16_t ty_param_len = get_u16_bump(sp);
-        sp += ty_param_len;
-    }
+    // Read in a dummy value; this used to be the number of parameters
+    uint16_t number_of_params = get_u16_bump(sp);
+    assert(number_of_params == 0 && "resource has type parameters on it");
 
     uint16_t sp_size = get_u16_bump(sp);
     const uint8_t *end_sp = sp + sp_size;