about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Woerister <michaelwoerister@posteo.net>2016-05-09 16:15:04 -0400
committerMichael Woerister <michaelwoerister@posteo.net>2016-05-09 16:17:00 -0400
commit118cc9e8e1fd72ea59c44c99a3ef3cc8abf9bbaf (patch)
tree8fc2237725f05b25f343463a7856d3d21e0dc94a
parent00eabcbefab39612a56ef958a213825207697323 (diff)
downloadrust-118cc9e8e1fd72ea59c44c99a3ef3cc8abf9bbaf.tar.gz
rust-118cc9e8e1fd72ea59c44c99a3ef3cc8abf9bbaf.zip
Fix some rebasing fallout.
-rw-r--r--src/librustc_trans/context.rs2
-rw-r--r--src/librustc_trans/mir/constant.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_trans/context.rs b/src/librustc_trans/context.rs
index 88edddad8c3..24095929f4f 100644
--- a/src/librustc_trans/context.rs
+++ b/src/librustc_trans/context.rs
@@ -756,7 +756,7 @@ impl<'b, 'tcx> CrateContext<'b, 'tcx> {
     }
 
     pub fn statics<'a>(&'a self) -> &'a RefCell<FnvHashMap<ValueRef, DefId>> {
-        &self.local.statics
+        &self.local().statics
     }
 
     pub fn impl_method_cache<'a>(&'a self)
diff --git a/src/librustc_trans/mir/constant.rs b/src/librustc_trans/mir/constant.rs
index 93206179837..267d9e9a23a 100644
--- a/src/librustc_trans/mir/constant.rs
+++ b/src/librustc_trans/mir/constant.rs
@@ -233,7 +233,7 @@ impl<'a, 'tcx> MirConstContext<'a, 'tcx> {
             let trait_id = trait_item.container().id();
             let substs = instance.substs;
             let trait_ref = ty::Binder(substs.to_trait_ref(ccx.tcx(), trait_id));
-            let vtable = common::fulfill_obligation(ccx, DUMMY_SP, trait_ref);
+            let vtable = common::fulfill_obligation(ccx.shared(), DUMMY_SP, trait_ref);
             if let traits::VtableImpl(vtable_impl) = vtable {
                 let name = ccx.tcx().item_name(instance.def);
                 for ac in ccx.tcx().associated_consts(vtable_impl.impl_def_id) {