Skip to content

Commit

Permalink
Unrolled build for rust-lang#118115
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#118115 - spastorino:fix-old-fn-names, r=compiler-errors

Fix occurrences of old fn names in comment and tracing
  • Loading branch information
rust-timer authored Nov 21, 2023
2 parents 85c42b7 + 8cf94c9 commit 07dc609
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion compiler/rustc_trait_selection/src/traits/coherence.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1010,7 +1010,7 @@ impl<'a, 'tcx> ProofTreeVisitor<'tcx> for AmbiguityCausesVisitor<'a> {

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

// For bound predicates we simply call `infcx.replace_bound_vars_with_placeholders`
// For bound predicates we simply call `infcx.instantiate_binder_with_placeholders`
// and then prove the resulting predicate as a nested goal.
let trait_ref = match predicate.kind().no_bound_vars() {
Some(ty::PredicateKind::Clause(ty::ClauseKind::Trait(tr))) => tr.trait_ref,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_ty_utils/src/instance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ fn resolve_instance<'tcx>(

Ok(Some(Instance { def, args }))
};
debug!("inner_resolve_instance: result={:?}", result);
debug!("resolve_instance: result={:?}", result);
result
}

Expand Down

0 comments on commit 07dc609

Please sign in to comment.