Skip to content

-Z trait-solver=next: Deduplicate region constraints in query responses #111172

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.

Sign up for GitHub

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

Closed
wants to merge 16 commits into from
Closed

-Z trait-solver=next: Deduplicate region constraints in query responses #111172

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
89d955f
Initial attempt at deduplicating region constraints
ndrewxie May 4, 2023
074b9b0
Added a few comments
ndrewxie May 4, 2023
96f35a7
Added a few comments (3)
ndrewxie May 4, 2023
dce80d4
Fixed Rc/Arc issue and tidy errors
ndrewxie May 4, 2023
3ac13f5
Fiddling around with git... Fixed Rc/Arc issue with Lrc, unstaged src…
ndrewxie May 4, 2023
a4e4973
Removed debug printlns (whoops)
ndrewxie May 4, 2023
6de1233
fixup! Added a few comments
ndrewxie May 5, 2023
3a3e40c
Moved deduplication to compute_external_query_constraints instead of …
ndrewxie May 11, 2023
4e10821
Added more comments + slight cleanup to code
ndrewxie May 14, 2023
3d28fda
Removed some ignore warning markers added during debugging
ndrewxie May 14, 2023
73dbf78
Minor simplifications+optimizations for core dedup solver, added a fe…
ndrewxie May 15, 2023
021310a
Removed some (likely premature) optimizations to improve code clarity
ndrewxie May 22, 2023
7c55e56
Removed unsound notion of unremovable_vars, prioritized removal of ne…
ndrewxie May 28, 2023
61d08a6
Removed unsound notion of unremovable_vars, prioritized removal of ne…
ndrewxie May 28, 2023
711986b
Hopefully simplified solver impl a bit
ndrewxie May 29, 2023
67fbe17
Hopefully simplified solver impl a bit (2)
ndrewxie May 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Removed debug printlns (whoops)
  • Loading branch information
@ndrewxie
ndrewxie committed May 28, 2023
commit a4e4973a95bfd9bad7f7ec45da992f330757b00f
2 changes: 0 additions & 2 deletions compiler/rustc_trait_selection/src/solve/eval_ctxt/canonical/dedup_solver/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ enum ConstraintType<'tcx> {

impl<'tcx> Deduper<'tcx> {
pub fn dedup(tcx: TyCtxt<'tcx>, input: &mut Canonical<'tcx, Response<'tcx>>) {
println!("INPUT: {:#?}", input);
let mut constraints = input.value.external_constraints.deref().clone();
let mut deduper = Self {
tcx,
Expand All @@ -43,7 +42,6 @@ impl<'tcx> Deduper<'tcx> {
};
deduper.dedup_internal(&mut constraints, &mut input.variables, &mut input.max_universe);
input.value.external_constraints = tcx.mk_external_constraints(constraints);
println!("OUTPUT: {:#?}", input);
}
fn dedup_internal(
&mut self,
Expand Down