diff options
| author | bors <bors@rust-lang.org> | 2023-02-19 15:36:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-02-19 15:36:46 +0000 |
| commit | dc89a803d64fb6172c8406996831353bee18c3a7 (patch) | |
| tree | 32376b6cd8a7cfdd594aed1e2ca2edc842a690a4 /compiler/rustc_hir_analysis/src | |
| parent | eebdfb55fce148676c24555505aebf648123b2de (diff) | |
| parent | 24d907a7a97de34ed4150b3c2172874e4774baa7 (diff) | |
| download | rust-dc89a803d64fb6172c8406996831353bee18c3a7.tar.gz rust-dc89a803d64fb6172c8406996831353bee18c3a7.zip | |
Auto merge of #108237 - GuillaumeGomez:rollup-olxq5dt, r=GuillaumeGomez
Rollup of 5 pull requests Successful merges: - #107766 (Fix json reexports of different items with same name) - #108129 (Correctly handle links starting with whitespace) - #108188 (Change src/etc/vscode_settings.json to always treat ./library as the sysroot source) - #108203 (Fix RPITITs in default trait methods (by assuming projection predicates in param-env)) - #108212 (Download rustfmt regardless of rustc being set in config.toml) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_hir_analysis/src')
| -rw-r--r-- | compiler/rustc_hir_analysis/src/check/wfcheck.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_hir_analysis/src/check/wfcheck.rs b/compiler/rustc_hir_analysis/src/check/wfcheck.rs index 66c3904af96..5743f086f89 100644 --- a/compiler/rustc_hir_analysis/src/check/wfcheck.rs +++ b/compiler/rustc_hir_analysis/src/check/wfcheck.rs @@ -1599,7 +1599,7 @@ fn check_return_position_impl_trait_in_trait_bounds<'tcx>( { for arg in fn_output.walk() { if let ty::GenericArgKind::Type(ty) = arg.unpack() - && let ty::Alias(ty::Projection, proj) = ty.kind() + && let ty::Alias(ty::Opaque, proj) = ty.kind() && tcx.def_kind(proj.def_id) == DefKind::ImplTraitPlaceholder && tcx.impl_trait_in_trait_parent(proj.def_id) == fn_def_id.to_def_id() { |