-
Notifications
You must be signed in to change notification settings - Fork 13.9k
include outer_inclusive_binder
of pattern types
#147226
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
Conversation
|
||
fn add_ty_pat(&mut self, pat: <I as Interner>::Pat) { | ||
self.add_flags(pat.flags()); | ||
self.add_exclusive_binder(pat.outer_exclusive_binder()); |
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.
this is the one line that actually fixes the issue. We didn't record the fact that pattern types might have bound variables inside them without this
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.
without it, this:
rust/compiler/rustc_middle/src/ty/pattern.rs
Lines 36 to 49 in 1e1a394
fn outer_exclusive_binder(&self) -> rustc_type_ir::DebruijnIndex { | |
match &**self { | |
ty::PatternKind::Range { start, end } => { | |
start.outer_exclusive_binder().max(end.outer_exclusive_binder()) | |
} | |
ty::PatternKind::Or(pats) => { | |
let mut idx = pats[0].outer_exclusive_binder(); | |
for pat in pats[1..].iter() { | |
idx = idx.max(pat.outer_exclusive_binder()); | |
} | |
idx | |
} | |
} | |
} |
is actually dead code
@bors r+ rollup there's also a theoretical unsoundness fixed by this change where anonymize bound vars doesn't result in different bound vars, so we get different gj gamer |
…lver, r=lcnr include `outer_inclusive_binder` of pattern types Fixes rust-lang/trait-system-refactor-initiative#237 r? `@lcnr`
…lver, r=lcnr include `outer_inclusive_binder` of pattern types Fixes rust-lang/trait-system-refactor-initiative#237 r? ``@lcnr``
Rollup of 8 pull requests Successful merges: - #146593 (Allow specifying multiple bounds for same associated item, except in trait objects) - #147177 ([DebugInfo] Fix MSVC tuple child creation) - #147195 (iter repeat: add tests for new count and last behavior) - #147202 (Swap order of `resolve_coroutine_interiors` and `handle_opaque_type_uses`) - #147204 (Refactor ArrayWindows to use a slice) - #147219 (Add proper error handling for closure in impl) - #147226 (include `outer_inclusive_binder` of pattern types) - #147230 (Fix typo in 'unfulfilled_lint_expectation' to plural) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of #147226 - jdonszelmann:pattern-types-next-solver, r=lcnr include `outer_inclusive_binder` of pattern types Fixes rust-lang/trait-system-refactor-initiative#237 r? ```@lcnr```
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#146593 (Allow specifying multiple bounds for same associated item, except in trait objects) - rust-lang#147177 ([DebugInfo] Fix MSVC tuple child creation) - rust-lang#147195 (iter repeat: add tests for new count and last behavior) - rust-lang#147202 (Swap order of `resolve_coroutine_interiors` and `handle_opaque_type_uses`) - rust-lang#147204 (Refactor ArrayWindows to use a slice) - rust-lang#147219 (Add proper error handling for closure in impl) - rust-lang#147226 (include `outer_inclusive_binder` of pattern types) - rust-lang#147230 (Fix typo in 'unfulfilled_lint_expectation' to plural) r? `@ghost` `@rustbot` modify labels: rollup
Fixes rust-lang/trait-system-refactor-initiative#237
r? @lcnr