diff --git a/src/librustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs index 193b53bcfc2d..2dccf77da8ed 100644 --- a/src/librustc/metadata/encoder.rs +++ b/src/librustc/metadata/encoder.rs @@ -61,7 +61,6 @@ pub struct EncodeParams<'a> { tcx: ty::ctxt, reexports2: middle::resolve::ExportMap2, item_symbols: &'a RefCell>, - discrim_symbols: &'a HashMap, non_inlineable_statics: &'a HashSet, 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>, - discrim_symbols: &'a HashMap, non_inlineable_statics: &'a HashSet, 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, diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs index f9293063a412..60afadcb68a4 100644 --- a/src/librustc/middle/trans/base.rs +++ b/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, diff --git a/src/librustc/middle/trans/context.rs b/src/librustc/middle/trans/context.rs index 44288cd3b64f..3c3e92d00adc 100644 --- a/src/librustc/middle/trans/context.rs +++ b/src/librustc/middle/trans/context.rs @@ -52,8 +52,6 @@ pub struct CrateContext { reachable: @mut HashSet, item_symbols: RefCell>, link_meta: LinkMeta, - discrims: HashMap, - discrim_symbols: HashMap, tydescs: HashMap, // 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(),