@@ -32,7 +32,7 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
3232 _,
3333 ) = error. clone ( )
3434 && let ( Subtype ( sup_trace) , Subtype ( sub_trace) ) = ( & sup_origin, & sub_origin)
35- && let ObligationCauseCode :: CompareImplItem { trait_item_def_id, .. } =
35+ && let & ObligationCauseCode :: CompareImplItem { trait_item_def_id, .. } =
3636 sub_trace. cause . code ( )
3737 && sub_trace. values == sup_trace. values
3838 && let ValuePairs :: PolySigs ( ExpectedFound { expected, found } ) = sub_trace. values
@@ -50,9 +50,9 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
5050 sp : Span ,
5151 expected : ty:: PolyFnSig < ' tcx > ,
5252 found : ty:: PolyFnSig < ' tcx > ,
53- trait_def_id : DefId ,
53+ trait_item_def_id : DefId ,
5454 ) -> ErrorGuaranteed {
55- let trait_sp = self . tcx ( ) . def_span ( trait_def_id ) ;
55+ let trait_sp = self . tcx ( ) . def_span ( trait_item_def_id ) ;
5656
5757 // Mark all unnamed regions in the type with a number.
5858 // This diagnostic is called in response to lifetime errors, so be informative.
@@ -98,7 +98,7 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
9898 . name ;
9999
100100 // Get the span of all the used type parameters in the method.
101- let assoc_item = self . tcx ( ) . associated_item ( trait_def_id ) ;
101+ let assoc_item = self . tcx ( ) . associated_item ( trait_item_def_id ) ;
102102 let mut visitor = TypeParamSpanVisitor { tcx : self . tcx ( ) , types : vec ! [ ] } ;
103103 match assoc_item. kind {
104104 ty:: AssocKind :: Fn => {
0 commit comments