Skip to content

Commit

Permalink
Rollup merge of rust-lang#108916 - fmease:rm-unused-ret-val, r=compil…
Browse files Browse the repository at this point in the history
…er-errors

Remove an unused return value in `rustc_hir_typeck`

Unused since rust-lang#89580. Just something I noticed a while ago.

`@rustbot` label C-cleanup
  • Loading branch information
matthiaskrgr authored Mar 8, 2023
2 parents e6f39f7 + a74e651 commit a22c5f9
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -301,16 +301,12 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
span: Span,
def_id: DefId,
substs: SubstsRef<'tcx>,
) -> (ty::InstantiatedPredicates<'tcx>, Vec<Span>) {
) -> ty::InstantiatedPredicates<'tcx> {
let bounds = self.tcx.predicates_of(def_id);
let spans: Vec<Span> = bounds.predicates.iter().map(|(_, span)| *span).collect();
let result = bounds.instantiate(self.tcx, substs);
let result = self.normalize(span, result);
debug!(
"instantiate_bounds(bounds={:?}, substs={:?}) = {:?}, {:?}",
bounds, substs, result, spans,
);
(result, spans)
debug!("instantiate_bounds(bounds={:?}, substs={:?}) = {:?}", bounds, substs, result);
result
}

pub(in super::super) fn normalize<T>(&self, span: Span, value: T) -> T
Expand Down Expand Up @@ -1389,7 +1385,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}
_ => false,
};
let (bounds, _) = self.instantiate_bounds(span, def_id, &substs);
let bounds = self.instantiate_bounds(span, def_id, &substs);

for mut obligation in traits::predicates_for_generics(
|idx, predicate_span| {
Expand Down

0 comments on commit a22c5f9

Please sign in to comment.