mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rollup merge of #108916 - fmease:rm-unused-ret-val, r=compiler-errors

Browse source 
Remove an unused return value in `rustc_hir_typeck`

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

`@rustbot` label C-cleanup
This commit is contained in:
Matthias Krüger 2023-03-08 21:26:53 +01:00 • committed by GitHub
commit a22c5f9581
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs
View file

@ -301,16 +301,12 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
span: Span, span: Span,
def_id: DefId, def_id: DefId,
substs: SubstsRef<'tcx>, substs: SubstsRef<'tcx>,
) -> (ty::InstantiatedPredicates<'tcx>, Vec<Span>) { ) -> ty::InstantiatedPredicates<'tcx> {
let bounds = self.tcx.predicates_of(def_id); 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 = bounds.instantiate(self.tcx, substs);
let result = self.normalize(span, result); let result = self.normalize(span, result);
debug!( debug!("instantiate_bounds(bounds={:?}, substs={:?}) = {:?}", bounds, substs, result);
"instantiate_bounds(bounds={:?}, substs={:?}) = {:?}, {:?}", result
bounds, substs, result, spans,
);
(result, spans)
} }
pub(in super::super) fn normalize<T>(&self, span: Span, value: T) -> T pub(in super::super) fn normalize<T>(&self, span: Span, value: T) -> T
@ -1389,7 +1385,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
} }
_ => false, _ => 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( for mut obligation in traits::predicates_for_generics(
|idx, predicate_span| { |idx, predicate_span| {