diff options
| author | bors <bors@rust-lang.org> | 2024-09-06 07:18:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-06 07:18:50 +0000 |
| commit | a3af2085ccdc1890fef22b96397ac58f714c5580 (patch) | |
| tree | b89acb130790e38a5958301b1b156c847912bd57 /compiler/rustc_trait_selection/src | |
| parent | d678b81485b05680801554d744ea2696949f0135 (diff) | |
| parent | 11d5614a74ba0da0aeba2848b1b13e9ab2fdee4c (diff) | |
| download | rust-a3af2085ccdc1890fef22b96397ac58f714c5580.tar.gz rust-a3af2085ccdc1890fef22b96397ac58f714c5580.zip | |
Auto merge of #130016 - matthiaskrgr:rollup-fopistw, r=matthiaskrgr
Rollup of 6 pull requests
Successful merges:
- #129021 (Check WF of source type's signature on fn pointer cast)
- #129781 (Make `./x.py <cmd> compiler/<crate>` aware of the crate's features)
- #129963 (Inaccurate `{Path,OsStr}::to_string_lossy()` documentation)
- #129969 (Make `Ty::boxed_ty` return an `Option`)
- #129995 (Remove wasm32-wasip2's tier 2 status from release notes)
- #130013 (coverage: Count await when the Future is immediately ready )
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_trait_selection/src')
| -rw-r--r-- | compiler/rustc_trait_selection/src/error_reporting/infer/mod.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_trait_selection/src/error_reporting/infer/mod.rs b/compiler/rustc_trait_selection/src/error_reporting/infer/mod.rs index bff2a184b19..65d21518491 100644 --- a/compiler/rustc_trait_selection/src/error_reporting/infer/mod.rs +++ b/compiler/rustc_trait_selection/src/error_reporting/infer/mod.rs @@ -348,8 +348,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> { } } if let Some(ty::error::ExpectedFound { found, .. }) = exp_found - && ty.is_box() - && ty.boxed_ty() == found + && ty.boxed_ty() == Some(found) && let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(span) { err.span_suggestion( |