diff options
| author | bors <bors@rust-lang.org> | 2025-02-14 06:13:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-02-14 06:13:42 +0000 |
| commit | 905b1bf1ccccaf091a880b069f80dc38ad9ecad3 (patch) | |
| tree | a831d6c9ec5263bb07633fc3c58e6ada46a2825d /compiler/rustc_trait_selection/src | |
| parent | 6dfeab5c9e8a17a6636c1479037baabc4b1e9562 (diff) | |
| parent | e8d0d0079857e74052eec2887edfa2e9a509769d (diff) | |
| download | rust-905b1bf1ccccaf091a880b069f80dc38ad9ecad3.tar.gz rust-905b1bf1ccccaf091a880b069f80dc38ad9ecad3.zip | |
Auto merge of #137010 - workingjubilee:rollup-g00c07v, r=workingjubilee
Rollup of 9 pull requests Successful merges: - #135439 (Make `-O` mean `OptLevel::Aggressive`) - #136460 (Simplify `rustc_span` `analyze_source_file`) - #136904 (add `IntoBounds` trait) - #136908 ([AIX] expect `EINVAL` for `pthread_mutex_destroy`) - #136924 (Add profiling of bootstrap commands using Chrome events) - #136951 (Use the right binder for rebinding `PolyTraitRef`) - #136981 (ci: switch loongarch jobs to free runners) - #136992 (Update backtrace) - #136993 ([cg_llvm] Remove dead error message) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_trait_selection/src')
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/util.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_trait_selection/src/traits/util.rs b/compiler/rustc_trait_selection/src/traits/util.rs index d30363ec158..15f5cf916a4 100644 --- a/compiler/rustc_trait_selection/src/traits/util.rs +++ b/compiler/rustc_trait_selection/src/traits/util.rs @@ -47,11 +47,11 @@ pub fn expand_trait_aliases<'tcx>( queue.extend( tcx.explicit_super_predicates_of(trait_pred.def_id()) .iter_identity_copied() - .map(|(clause, span)| { + .map(|(super_clause, span)| { let mut spans = spans.clone(); spans.push(span); ( - clause.instantiate_supertrait( + super_clause.instantiate_supertrait( tcx, clause.kind().rebind(trait_pred.trait_ref), ), |