---

yaml
---
r: 90721
b: refs/heads/master
c: 5dcc516
h: refs/heads/master
i:
  90719: 0f8181a
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0f3e4fea4f9d5e38843429eb59c5b38be84087d1
+refs/heads/master: 5dcc5165a6cabbe5dc28c6564464e655b6b43638
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

trunk/src/librustc/metadata/encoder.rs

@@ -61,7 +61,6 @@ pub struct EncodeParams<'a> {
     tcx: ty::ctxt,
     reexports2: middle::resolve::ExportMap2,
     item_symbols: &'a RefCell<HashMap<ast::NodeId, ~str>>,
-    discrim_symbols: &'a HashMap<ast::NodeId, @str>,
     non_inlineable_statics: &'a HashSet<ast::NodeId>,
     link_meta: &'a LinkMeta,
     cstore: @mut cstore::CStore,
@@ -91,7 +90,6 @@ pub struct EncodeContext<'a> {
     stats: @mut Stats,
     reexports2: middle::resolve::ExportMap2,
     item_symbols: &'a RefCell<HashMap<ast::NodeId, ~str>>,
-    discrim_symbols: &'a HashMap<ast::NodeId, @str>,
     non_inlineable_statics: &'a HashSet<ast::NodeId>,
     link_meta: &'a LinkMeta,
     cstore: &'a cstore::CStore,
@@ -1745,7 +1743,6 @@ pub fn encode_metadata(parms: EncodeParams, crate: &Crate) -> ~[u8] {
         diag,
         tcx,
         reexports2,
-        discrim_symbols,
         cstore,
         encode_inlined_item,
         link_meta,
@@ -1761,7 +1758,6 @@ pub fn encode_metadata(parms: EncodeParams, crate: &Crate) -> ~[u8] {
         stats: stats,
         reexports2: reexports2,
         item_symbols: item_symbols,
-        discrim_symbols: discrim_symbols,
         non_inlineable_statics: non_inlineable_statics,
         link_meta: link_meta,
         cstore: cstore,

trunk/src/librustc/middle/trans/base.rs

@@ -3056,14 +3056,12 @@ pub fn crate_ctxt_to_encode_parms<'r>(cx: &'r CrateContext, ie: encoder::encode_
 
         let diag = cx.sess.diagnostic();
         let item_symbols = &cx.item_symbols;
-        let discrim_symbols = &cx.discrim_symbols;
         let link_meta = &cx.link_meta;
         encoder::EncodeParams {
             diag: diag,
             tcx: cx.tcx,
             reexports2: cx.exp_map2,
             item_symbols: item_symbols,
-            discrim_symbols: discrim_symbols,
             non_inlineable_statics: &cx.non_inlineable_statics,
             link_meta: link_meta,
             cstore: cx.sess.cstore,

trunk/src/librustc/middle/trans/context.rs

@@ -52,8 +52,6 @@ pub struct CrateContext {
      reachable: @mut HashSet<ast::NodeId>,
      item_symbols: RefCell<HashMap<ast::NodeId, ~str>>,
      link_meta: LinkMeta,
-     discrims: HashMap<ast::DefId, ValueRef>,
-     discrim_symbols: HashMap<ast::NodeId, @str>,
      tydescs: HashMap<ty::t, @mut tydesc_info>,
      // Set when running emit_tydescs to enforce that no more tydescs are
      // created.
@@ -191,8 +189,6 @@ impl CrateContext {
                   reachable: reachable,
                   item_symbols: RefCell::new(HashMap::new()),
                   link_meta: link_meta,
-                  discrims: HashMap::new(),
-                  discrim_symbols: HashMap::new(),
                   tydescs: HashMap::new(),
                   finished_tydescs: false,
                   external: HashMap::new(),