Skip to content

Commit 07dc609

Browse files
authored
Unrolled build for rust-lang#118115
Rollup merge of rust-lang#118115 - spastorino:fix-old-fn-names, r=compiler-errors Fix occurrences of old fn names in comment and tracing
2 parents 85c42b7 + 8cf94c9 commit 07dc609

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Diff for: compiler/rustc_trait_selection/src/traits/coherence.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ impl<'a, 'tcx> ProofTreeVisitor<'tcx> for AmbiguityCausesVisitor<'a> {
10101010

10111011
let Goal { param_env, predicate } = goal.goal();
10121012

1013-
// For bound predicates we simply call `infcx.replace_bound_vars_with_placeholders`
1013+
// For bound predicates we simply call `infcx.instantiate_binder_with_placeholders`
10141014
// and then prove the resulting predicate as a nested goal.
10151015
let trait_ref = match predicate.kind().no_bound_vars() {
10161016
Some(ty::PredicateKind::Clause(ty::ClauseKind::Trait(tr))) => tr.trait_ref,

Diff for: compiler/rustc_ty_utils/src/instance.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ fn resolve_instance<'tcx>(
6161

6262
Ok(Some(Instance { def, args }))
6363
};
64-
debug!("inner_resolve_instance: result={:?}", result);
64+
debug!("resolve_instance: result={:?}", result);
6565
result
6666
}
6767

0 commit comments

Comments
 (0)