Skip to content
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

Rudimentary support for dynamic trait objects #664

Merged
merged 37 commits into from
Jul 29, 2024
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift click to select a range
57de9c9
add stuff to generic_const test
ranjitjhala May 22, 2024
db4a43a
asd Merge branch 'main' of github.com:flux-rs/flux
ranjitjhala Jun 14, 2024
73805c6
asd Merge branch 'main' of github.com:flux-rs/flux
ranjitjhala Jun 17, 2024
d9376ce
as Merge branch 'main' of github.com:flux-rs/flux
ranjitjhala Jun 25, 2024
2ff58ce
rm
ranjitjhala Jun 25, 2024
ba4f998
as Merge branch 'main' of github.com:flux-rs/flux
ranjitjhala Jun 27, 2024
c4803d1
ad Merge branch 'main' of github.com:flux-rs/flux
ranjitjhala Jun 29, 2024
0555720
qwea Merge branch 'main' of github.com:flux-rs/flux
ranjitjhala Jul 12, 2024
aae8cd2
as Merge branch 'main' of github.com:flux-rs/flux
ranjitjhala Jul 17, 2024
39ca3ab
ads Merge branch 'main' of github.com:flux-rs/flux
ranjitjhala Jul 19, 2024
c941f92
asd Merge branch 'main' of github.com:flux-rs/flux
ranjitjhala Jul 19, 2024
a383d2a
next: onto lower type
ranjitjhala Jul 20, 2024
40861ad
next: onto lower type
ranjitjhala Jul 22, 2024
e763acc
next: onto lower type
ranjitjhala Jul 23, 2024
d3af003
next: into constraint_gen
ranjitjhala Jul 23, 2024
961aa8d
next: into constraint_gen
ranjitjhala Jul 23, 2024
942704a
yay, dyn00 works (doesn't keel over)
ranjitjhala Jul 23, 2024
1e4f71c
yay, dyn00 works (doesn't keel over)
ranjitjhala Jul 23, 2024
64650ce
yay, dyn01 checks/fails as expected
ranjitjhala Jul 23, 2024
23c7453
clippy
ranjitjhala Jul 23, 2024
886ad1e
update pseudocode in README
ranjitjhala Jul 23, 2024
8ed155c
allow region vars in dyn
ranjitjhala Jul 23, 2024
193032b
allow region vars in dyn
ranjitjhala Jul 24, 2024
cbeaf3b
allow region vars in dyn
ranjitjhala Jul 24, 2024
eacee3c
Update crates/flux-middle/src/fhir/lift.rs
ranjitjhala Jul 25, 2024
e803419
use Dynamic instead of PolyTraitRef
ranjitjhala Jul 25, 2024
ae2dde8
use Dynamic instead of PolyTraitRef
ranjitjhala Jul 25, 2024
689d4b1
asd Merge branch 'dyn' of github.com:flux-rs/flux into dyn
ranjitjhala Jul 25, 2024
01c4724
remove DynKind (only support Dyn) else panic
ranjitjhala Jul 25, 2024
1acc11c
implement to_rustc for Dynamic/ExistentialPredicates
ranjitjhala Jul 25, 2024
5409fef
Update crates/flux-middle/src/rustc/lowering.rs
ranjitjhala Jul 28, 2024
b60b1a9
check dyn exi-preds are equal during subtyping
ranjitjhala Jul 28, 2024
6a755d5
restore
ranjitjhala Jul 28, 2024
eca76a0
use span_bug
ranjitjhala Jul 28, 2024
fa16a77
dont fill lifetimes in fill_generic_args
ranjitjhala Jul 28, 2024
a83c11d
dont fill lifetimes in fill_generic_args
ranjitjhala Jul 28, 2024
5974bc6
merge in GH edits
ranjitjhala Jul 28, 2024
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
dont fill lifetimes in fill_generic_args
  • Loading branch information
ranjitjhala committed Jul 28, 2024
commit a83c11dd93d81144ab57eee999c2864043fecf67
4 changes: 2 additions & 2 deletions crates/flux-fhir-analysis/src/conv/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 23,7 @@ use flux_middle::{
refining::{self, Refiner},
AdtSortDef, ESpan, WfckResults, INNERMOST,
},
rustc::{self, ty::Region},
rustc::{self},
};
use itertools::Itertools;
use rustc_data_structures::fx::FxIndexMap;
Expand All @@ -34,7 34,7 @@ use rustc_hir::{
};
use rustc_middle::{
middle::resolve_bound_vars::ResolvedArg,
ty::{self, AssocItem, AssocKind, BoundVar, EarlyParamRegion},
ty::{self, AssocItem, AssocKind, BoundVar},
};
use rustc_span::{
symbol::{kw, Ident},
Expand Down