-
-
Notifications
You must be signed in to change notification settings - Fork 14.5k
Remove 'static requirement on try_as_dyn #150161
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
Open
oli-obk
wants to merge
8
commits into
rust-lang:main
Choose a base branch
from
oli-obk:try_as_dyn_non_static
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+892
−75
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
7ab8607
Remove 'static requirement on try_as_dyn
oli-obk bd8e0bf
Add helper trait that restricts lifetimes and extra predicates to ens…
oli-obk 466c0e7
Add regression tests
oli-obk 5e6ea1b
Allow trivial bounds on impls
oli-obk e9fe630
Reject generic params on try_as_dyn output traits entirely
oli-obk 2f2ffaf
Add a bunch of tests and remove nonsensical check
oli-obk 8cb85b7
Builtin impls are cursed
oli-obk 1576bf5
Documentation
oli-obk 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
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
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
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 |
|---|---|---|
|
|
@@ -15,6 +15,7 @@ use std::fmt::Debug; | |
| use std::hash::{Hash, Hasher}; | ||
| use std::marker::PhantomData; | ||
| use std::num::NonZero; | ||
| use std::ops::ControlFlow; | ||
| use std::ptr::NonNull; | ||
| use std::{fmt, iter, str}; | ||
|
|
||
|
|
@@ -278,6 +279,57 @@ pub struct ImplTraitHeader<'tcx> { | |
| pub constness: hir::Constness, | ||
| } | ||
|
|
||
| impl<'tcx> ImplTraitHeader<'tcx> { | ||
| /// For trait impls, checks whether the type and trait only have generic lifetime parameters in their | ||
| /// arguments and only use any generic param once. | ||
| /// This is a pessimistic analysis, so it will reject projection types (except for weak aliases) | ||
| /// and other types that may be actually ok. We can allow more in the future. | ||
| pub fn is_fully_generic_for_reflection(self) -> bool { | ||
| #[derive(Default)] | ||
| struct ParamFinder { | ||
| seen: FxHashSet<u32>, | ||
| } | ||
|
|
||
| impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for ParamFinder { | ||
| type Result = ControlFlow<()>; | ||
| fn visit_region(&mut self, r: Region<'tcx>) -> Self::Result { | ||
| match r.kind() { | ||
| RegionKind::ReEarlyParam(param) => { | ||
| if self.seen.insert(param.index) { | ||
| ControlFlow::Continue(()) | ||
| } else { | ||
| ControlFlow::Break(()) | ||
| } | ||
| } | ||
| RegionKind::ReBound(..) | RegionKind::ReLateParam(_) => { | ||
|
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. Same thing here. |
||
| ControlFlow::Continue(()) | ||
| } | ||
| RegionKind::ReStatic | ||
| | RegionKind::ReVar(_) | ||
| | RegionKind::RePlaceholder(_) | ||
| | RegionKind::ReErased | ||
| | RegionKind::ReError(_) => ControlFlow::Break(()), | ||
| } | ||
| } | ||
|
|
||
| fn visit_ty(&mut self, t: Ty<'tcx>) -> Self::Result { | ||
| match t.kind() { | ||
| TyKind::Param(p) => { | ||
| // Reject using a parameter twice (e.g. in `Foo<T, T>`) | ||
| if !self.seen.insert(p.index) { | ||
| return ControlFlow::Break(()); | ||
| } | ||
| } | ||
| TyKind::Alias(..) => return ControlFlow::Break(()), | ||
| _ => (), | ||
| } | ||
| t.super_visit_with(self) | ||
| } | ||
| } | ||
| self.trait_ref.instantiate_identity().visit_with(&mut ParamFinder::default()).is_continue() | ||
| } | ||
| } | ||
|
|
||
| #[derive(Copy, Clone, PartialEq, Eq, Hash, TyEncodable, TyDecodable, HashStable, Debug)] | ||
| #[derive(TypeFoldable, TypeVisitable, Default)] | ||
| pub enum Asyncness { | ||
|
|
||
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
Oops, something went wrong.
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.
Is the
ReLateParambranch here reachable?