bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Fix some rebasing fallout.

Browse source
This commit is contained in:
Michael Woerister 2016-05-09 16:15:04 -04:00
parent 00eabcbefa
commit 118cc9e8e1
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc_trans/context.rs
View file

@ -756,7 +756,7 @@ impl<'b, 'tcx> CrateContext<'b, 'tcx> {
} }
pub fn statics<'a>(&'a self) -> &'a RefCell<FnvHashMap<ValueRef, DefId>> { 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) pub fn impl_method_cache<'a>(&'a self)

2
src/librustc_trans/mir/constant.rs
View file

@ -233,7 +233,7 @@ impl<'a, 'tcx> MirConstContext<'a, 'tcx> {
let trait_id = trait_item.container().id(); let trait_id = trait_item.container().id();
let substs = instance.substs; let substs = instance.substs;
let trait_ref = ty::Binder(substs.to_trait_ref(ccx.tcx(), trait_id)); 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 { if let traits::VtableImpl(vtable_impl) = vtable {
let name = ccx.tcx().item_name(instance.def); let name = ccx.tcx().item_name(instance.def);
for ac in ccx.tcx().associated_consts(vtable_impl.impl_def_id) { for ac in ccx.tcx().associated_consts(vtable_impl.impl_def_id) {