bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #98921 - TaKO8Ki:refactor-fulfillment-context-select, r=Dylan-DPC

Browse source 
Refactor: remove a redundant mutable variable
This commit is contained in:
Matthias Krüger 2022-07-05 17:08:15 +02:00 • committed by GitHub
commit 720eb123af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_trait_selection/src/traits/fulfill.rs
View file

@ -131,8 +131,6 @@ impl<'a, 'tcx> FulfillmentContext<'tcx> {
let span = debug_span!("select", obligation_forest_size = ?self.predicates.len()); let span = debug_span!("select", obligation_forest_size = ?self.predicates.len());
let _enter = span.enter(); let _enter = span.enter();
let mut errors = Vec::new();
// Process pending obligations. // Process pending obligations.
let outcome: Outcome<_, _> = self.predicates.process_obligations(&mut FulfillProcessor { let outcome: Outcome<_, _> = self.predicates.process_obligations(&mut FulfillProcessor {
selcx, selcx,
@ -142,7 +140,8 @@ impl<'a, 'tcx> FulfillmentContext<'tcx> {
// FIXME: if we kept the original cache key, we could mark projection // FIXME: if we kept the original cache key, we could mark projection
// obligations as complete for the projection cache here. // obligations as complete for the projection cache here.
errors.extend(outcome.errors.into_iter().map(to_fulfillment_error)); let errors: Vec<FulfillmentError<'tcx>> =
outcome.errors.into_iter().map(to_fulfillment_error).collect();
debug!( debug!(
"select({} predicates remaining, {} errors) done", "select({} predicates remaining, {} errors) done",
@ -728,7 +727,7 @@ impl<'a, 'b, 'tcx> FulfillProcessor<'a, 'b, 'tcx> {
} }
return ProcessResult::Changed(vec![]); return ProcessResult::Changed(vec![]);
} else { } else {
tracing::debug!("Does NOT hold: {:?}", obligation); debug!("Does NOT hold: {:?}", obligation);
} }
} }