diff options
| author | y21 <30553356+y21@users.noreply.github.com> | 2023-06-03 17:17:56 +0200 |
|---|---|---|
| committer | y21 <30553356+y21@users.noreply.github.com> | 2023-06-03 17:17:56 +0200 |
| commit | 268b08b01bfd95d315c03a9e3a69f254176b2a35 (patch) | |
| tree | 929d01e305f02a0cbdbccf8ead4b8e80ac8a2202 | |
| parent | 6d2ba95d0099f1a656da44c7f868be0074e5b5e1 (diff) | |
| download | rust-268b08b01bfd95d315c03a9e3a69f254176b2a35.tar.gz rust-268b08b01bfd95d315c03a9e3a69f254176b2a35.zip | |
do not use ty_adt_id from internal trait
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs b/compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs index 9f2740a3898..1044613c585 100644 --- a/compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs +++ b/compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs @@ -27,7 +27,6 @@ use rustc_infer::infer::error_reporting::TypeErrCtxt; use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind}; use rustc_infer::infer::{DefineOpaqueTypes, InferOk, LateBoundRegionConversionTime}; use rustc_middle::hir::map; -use rustc_middle::query::Key; use rustc_middle::ty::error::TypeError::{self, Sorts}; use rustc_middle::ty::{ self, suggest_arbitrary_trait_bound, suggest_constraining_type_param, AdtKind, @@ -3701,8 +3700,8 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> { let Some(typeck_results) = self.typeck_results.as_ref() else { return }; // Make sure we're dealing with the `Option` type. - let Some(ty_adt_did) = typeck_results.expr_ty_adjusted(expr).ty_adt_id() else { return }; - if !tcx.is_diagnostic_item(sym::Option, ty_adt_did) { + let Some(option_ty_adt) = typeck_results.expr_ty_adjusted(expr).ty_adt_def() else { return }; + if !tcx.is_diagnostic_item(sym::Option, option_ty_adt.did()) { return; } |
