-
-
Notifications
You must be signed in to change notification settings - Fork 15.5k
Error on projection of dyn noncompat type in old trait solver #154992
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -27,6 +27,7 @@ use super::{ | |
| SelectionError, specialization_graph, translate_args, util, | ||
| }; | ||
| use crate::diagnostics::InherentProjectionNormalizationOverflow; | ||
| use crate::error_reporting::traits::report_dyn_incompatibility; | ||
| use crate::infer::{BoundRegionConversionTime, InferOk}; | ||
| use crate::traits::normalize::{normalize_with_depth, normalize_with_depth_to}; | ||
| use crate::traits::query::evaluate_obligation::InferCtxtExt as _; | ||
|
|
@@ -702,6 +703,44 @@ fn project<'cx, 'tcx>( | |
| ))); | ||
| } | ||
|
|
||
| // `<dyn Trait>::Name` is only valid when `Trait` is dyn-compatible. | ||
| // If it isn't, create an error at the projection site and return a tainted error term. | ||
| let self_ty = selcx.infcx.shallow_resolve(obligation.predicate.self_ty()); | ||
| if let ty::Dynamic(data, ..) = self_ty.kind() { | ||
| if let Some(def_id) = data.principal_def_id() { | ||
| let tcx = selcx.tcx(); | ||
| // Delaying a bug is fine here: | ||
| // - In case of a dymmy span, we are in a canonical query. | ||
| // - `CheckAssociatedTypeBounds` means that the trait object is part of the trait's item bounds | ||
| // or the impl's associated type; both are checked at their own definition | ||
| // where the error is already reported with a better span. | ||
| if !tcx.is_dyn_compatible(def_id) { | ||
| let span = obligation.cause.span; | ||
| let guar = if span.is_dummy() | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. comment why we can delay bug here I guess it's that this should be handled in WF instead?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Comment added |
||
| || matches!( | ||
| obligation.cause.code(), | ||
| ObligationCauseCode::CheckAssociatedTypeBounds { .. } | ||
| ) { | ||
| tcx.dcx().span_delayed_bug( | ||
| span, | ||
| format!( | ||
| "projection from non-dyn-compatible trait `{}`", | ||
| tcx.def_path_str(def_id) | ||
| ), | ||
| ) | ||
| } else { | ||
| let violations = tcx.dyn_compatibility_violations(def_id); | ||
| report_dyn_incompatibility(tcx, span, None, def_id, &violations).emit() | ||
| }; | ||
| return Ok(Projected::Progress(Progress::error_for_term( | ||
| tcx, | ||
| obligation.predicate, | ||
| guar, | ||
| ))); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| let mut candidates = ProjectionCandidateSet::None; | ||
|
|
||
| // Make sure that the following procedures are kept in order. ParamEnv | ||
|
|
@@ -846,7 +885,13 @@ fn assemble_candidates_from_object_ty<'cx, 'tcx>( | |
| } | ||
| _ => return, | ||
| }; | ||
| let env_clauses = data | ||
|
|
||
| // Projecting `dyn Trait` is only valid when `Trait` is dyn-compatible. | ||
| if data.principal_def_id().is_some_and(|def_id| !tcx.is_dyn_compatible(def_id)) { | ||
| return; | ||
| } | ||
|
|
||
| let env_predicates = data | ||
| .projection_bounds() | ||
| .filter(|bound| bound.item_def_id() == obligation.predicate.expect_projection_def_id()) | ||
| .map(|p| p.with_self_ty(tcx, object_ty).upcast(tcx)); | ||
|
|
@@ -856,7 +901,7 @@ fn assemble_candidates_from_object_ty<'cx, 'tcx>( | |
| obligation, | ||
| candidate_set, | ||
| ProjectionCandidate::Object, | ||
| env_clauses, | ||
| env_predicates, | ||
| false, | ||
| ); | ||
| } | ||
|
|
||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| // Check that we are not producing long error messages | ||
|
|
||
| trait Trait { | ||
| type Output; | ||
| fn process<T>(&mut self, input: T) -> T; | ||
| } | ||
|
|
||
| struct MyImpl; | ||
|
|
||
| impl Trait for MyImpl { | ||
| type Output = &'static str; | ||
| fn process<T>(&mut self, input: T) -> T { input } | ||
| } | ||
|
|
||
| fn make() -> impl Trait<Output = <dyn Trait<Output = &'static str> as Trait>::Output> { | ||
| //~^ ERROR the trait `Trait` is not dyn compatible | ||
| MyImpl | ||
| } | ||
|
|
||
| fn main() {} |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| error[E0038]: the trait `Trait` is not dyn compatible | ||
| --> $DIR/dyn-proj-non-dyn-compat.rs:15:14 | ||
| | | ||
| LL | fn make() -> impl Trait<Output = <dyn Trait<Output = &'static str> as Trait>::Output> { | ||
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `Trait` is not dyn compatible | ||
| | | ||
| note: for a trait to be dyn compatible it needs to allow building a vtable | ||
| for more information, visit <https://doc.rust-lang.org/reference/items/traits.html#dyn-compatibility> | ||
| --> $DIR/dyn-proj-non-dyn-compat.rs:5:8 | ||
| | | ||
| LL | trait Trait { | ||
| | ----- this trait is not dyn compatible... | ||
| LL | type Output; | ||
| LL | fn process<T>(&mut self, input: T) -> T; | ||
| | ^^^^^^^ ...because method `process` has generic type parameters | ||
| = help: consider moving `process` to another trait | ||
| = help: only type `MyImpl` implements `Trait`; consider using it directly instead. | ||
|
|
||
| error: aborting due to 1 previous error | ||
|
|
||
| For more information about this error, try `rustc --explain E0038`. |
13 changes: 13 additions & 0 deletions
13
tests/ui/traits/object/dyn-type-param-bound-not-checked.rs
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| //@ check-pass | ||
| // Protection against a naive fix for #152607 | ||
|
|
||
| //@ revisions: current next | ||
|
|
||
| //@ ignore-compare-mode-next-solver (explicit revisions) | ||
| //@[next] compile-flags: -Znext-solver | ||
|
|
||
| trait Trait<T: Sized> {} | ||
|
|
||
| fn foo(_: &dyn Trait<[u32]>) {} | ||
|
|
||
| fn main() {} |
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
is there something preventing us from putting this into
assemble_candidates_from_object_ty?View changes since the review
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.
AFAIK there is no easy way to produce an error term from
assemble_candidates_from_object_ty. I wanted to avoid adding a new variant intoProjectionCandidateSetand then patching surrounding code.But if you prefer it, I can add a new variant to
ProjectionCandidateSet.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.
hmm, could you manually call
mark_errorwith https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/traits/enum.SelectionError.html#variant.TraitDynIncompatible instead of eagerly reporting an error there?I think that should do what we want 🤔
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.
Calling
mark_error(without eager reporting) will produce the following worse error message ongit-url-parse-rs: