@@ -664,7 +664,7 @@ pub fn coerce_unsized_into<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
664
664
}
665
665
}
666
666
667
- pub fn custom_coerce_unsize_info < ' ccx , ' tcx > ( ccx : & SharedCrateContext < ' ccx , ' tcx > ,
667
+ pub fn custom_coerce_unsize_info < ' scx , ' tcx > ( scx : & SharedCrateContext < ' scx , ' tcx > ,
668
668
source_ty : Ty < ' tcx > ,
669
669
target_ty : Ty < ' tcx > )
670
670
-> CustomCoerceUnsized {
@@ -674,13 +674,13 @@ pub fn custom_coerce_unsize_info<'ccx, 'tcx>(ccx: &SharedCrateContext<'ccx, 'tcx
674
674
subst:: VecPerParamSpace :: empty ( ) ) ;
675
675
676
676
let trait_ref = ty:: Binder ( ty:: TraitRef {
677
- def_id : ccx . tcx ( ) . lang_items . coerce_unsized_trait ( ) . unwrap ( ) ,
678
- substs : ccx . tcx ( ) . mk_substs ( trait_substs)
677
+ def_id : scx . tcx ( ) . lang_items . coerce_unsized_trait ( ) . unwrap ( ) ,
678
+ substs : scx . tcx ( ) . mk_substs ( trait_substs)
679
679
} ) ;
680
680
681
- match fulfill_obligation ( ccx , DUMMY_SP , trait_ref) {
681
+ match fulfill_obligation ( scx , DUMMY_SP , trait_ref) {
682
682
traits:: VtableImpl ( traits:: VtableImplData { impl_def_id, .. } ) => {
683
- ccx . tcx ( ) . custom_coerce_unsized_kind ( impl_def_id)
683
+ scx . tcx ( ) . custom_coerce_unsized_kind ( impl_def_id)
684
684
}
685
685
vtable => {
686
686
bug ! ( "invalid CoerceUnsized vtable: {:?}" , vtable) ;
@@ -2660,10 +2660,10 @@ fn iter_functions(llmod: llvm::ModuleRef) -> ValueIter {
2660
2660
///
2661
2661
/// This list is later used by linkers to determine the set of symbols needed to
2662
2662
/// be exposed from a dynamic library and it's also encoded into the metadata.
2663
- pub fn filter_reachable_ids ( ccx : & SharedCrateContext ) -> NodeSet {
2664
- ccx . reachable ( ) . iter ( ) . map ( |x| * x) . filter ( |id| {
2663
+ pub fn filter_reachable_ids ( scx : & SharedCrateContext ) -> NodeSet {
2664
+ scx . reachable ( ) . iter ( ) . map ( |x| * x) . filter ( |id| {
2665
2665
// First, only worry about nodes which have a symbol name
2666
- ccx . item_symbols ( ) . borrow ( ) . contains_key ( id)
2666
+ scx . item_symbols ( ) . borrow ( ) . contains_key ( id)
2667
2667
} ) . filter ( |& id| {
2668
2668
// Next, we want to ignore some FFI functions that are not exposed from
2669
2669
// this crate. Reachable FFI functions can be lumped into two
@@ -2678,9 +2678,9 @@ pub fn filter_reachable_ids(ccx: &SharedCrateContext) -> NodeSet {
2678
2678
//
2679
2679
// As a result, if this id is an FFI item (foreign item) then we only
2680
2680
// let it through if it's included statically.
2681
- match ccx . tcx ( ) . map . get ( id) {
2681
+ match scx . tcx ( ) . map . get ( id) {
2682
2682
hir_map:: NodeForeignItem ( ..) => {
2683
- ccx . sess ( ) . cstore . is_statically_included_foreign_item ( id)
2683
+ scx . sess ( ) . cstore . is_statically_included_foreign_item ( id)
2684
2684
}
2685
2685
_ => true ,
2686
2686
}
0 commit comments