Eagerly normalize HIR paths in new trait solver #113473
+109
−76
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -6,7 +6,7 @@ use crate::method::MethodCallee; | |||||
| use crate::TupleArgumentsFlag::*; | ||||||
| use crate::{errors, Expectation::*}; | ||||||
| use crate::{ | ||||||
| struct_span_err, BreakableCtxt, Diverges, Expectation, FnCtxt, Needs, TupleArgumentsFlag, | ||||||
| }; | ||||||
| use rustc_ast as ast; | ||||||
| use rustc_data_structures::fx::FxIndexSet; | ||||||
|
|
@@ -1346,25 +1346,31 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { | |||||
| ) -> Result<(&'tcx ty::VariantDef, Ty<'tcx>), ErrorGuaranteed> { | ||||||
| let path_span = qpath.span(); | ||||||
| let (def, ty) = self.finish_resolving_struct_path(qpath, path_span, hir_id); | ||||||
| let normalized = self.structurally_normalize_after_astconv(path_span, ty); | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
|
|
||||||
| let variant = match def { | ||||||
| Res::Err => { | ||||||
| let guar = | ||||||
| self.tcx.sess.delay_span_bug(path_span, "`Res::Err` but no error emitted"); | ||||||
| self.set_tainted_by_errors(guar); | ||||||
| return Err(guar); | ||||||
| } | ||||||
| Res::Def(DefKind::Variant, _) => match normalized.ty_adt_def() { | ||||||
| Some(adt) => Some(( | ||||||
| adt.variant_of_res(def), | ||||||
| adt.did(), | ||||||
| Self::user_args_for_adt(ty, normalized), | ||||||
| )), | ||||||
| _ => bug!("unexpected type: {:?}", normalized), | ||||||
| }, | ||||||
| Res::Def(DefKind::Struct | DefKind::Union | DefKind::TyAlias | DefKind::AssocTy, _) | ||||||
| | Res::SelfTyParam { .. } | ||||||
| | Res::SelfTyAlias { .. } => match normalized.ty_adt_def() { | ||||||
| Some(adt) if !adt.is_enum() => Some(( | ||||||
| adt.non_enum_variant(), | ||||||
| adt.did(), | ||||||
| Self::user_args_for_adt(ty, normalized), | ||||||
| )), | ||||||
| _ => None, | ||||||
| }, | ||||||
| _ => bug!("unexpected definition: {:?}", def), | ||||||
|
|
@@ -1379,9 +1385,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { | |||||
| // Check bounds on type arguments used in the path. | ||||||
| self.add_required_obligations_for_hir(path_span, did, args, hir_id); | ||||||
|
|
||||||
| Ok((variant, normalized)) | ||||||
| } else { | ||||||
| Err(match *normalized.kind() { | ||||||
| ty::Error(guar) => { | ||||||
| // E0071 might be caused by a spelling error, which will have | ||||||
| // already caused an error message and probably a suggestion | ||||||
|
|
@@ -1394,7 +1400,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { | |||||
| path_span, | ||||||
| E0071, | ||||||
| "expected struct, variant or union type, found {}", | ||||||
| normalized.sort_string(self.tcx) | ||||||
| ) | ||||||
| .span_label(path_span, "not a struct") | ||||||
| .emit(), | ||||||
|
|
@@ -1802,23 +1808,22 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { | |||||
| qpath: &QPath<'_>, | ||||||
| path_span: Span, | ||||||
| hir_id: hir::HirId, | ||||||
| ) -> (Res, Ty<'tcx>) { | ||||||
| match *qpath { | ||||||
| QPath::Resolved(ref maybe_qself, ref path) => { | ||||||
| let self_ty = maybe_qself.as_ref().map(|qself| self.to_ty(qself)); | ||||||
| let ty = self.astconv().res_to_ty(self_ty, path, hir_id, true); | ||||||
| (path.res, ty) | ||||||
| } | ||||||
| QPath::TypeRelative(ref qself, ref segment) => { | ||||||
| let ty = self.to_ty(qself); | ||||||
|
|
||||||
| let result = self | ||||||
| .astconv() | ||||||
| .associated_path_to_ty(hir_id, path_span, ty, qself, segment, true); | ||||||
| let ty = result | ||||||
| .map(|(ty, _, _)| ty) | ||||||
| .unwrap_or_else(|guar| Ty::new_error(self.tcx(), guar)); | ||||||
| let result = result.map(|(_, kind, def_id)| (kind, def_id)); | ||||||
|
|
||||||
| // Write back the new resolution. | ||||||
|
|
@@ -1827,8 +1832,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { | |||||
| (result.map_or(Res::Err, |(kind, def_id)| Res::Def(kind, def_id)), ty) | ||||||
| } | ||||||
| QPath::LangItem(lang_item, span, id) => { | ||||||
| self.resolve_lang_item_path(lang_item, span, hir_id, id) | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -325,15 +325,3 @@ impl<'a, 'tcx> AstConv<'tcx> for FnCtxt<'a, 'tcx> { | |
| Some(&self.infcx) | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we not normalize in the
structurally_resolve_typeinside of the loop?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, structurally resolve only processes obligations in the old solver