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.

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

Adjust lifetimes on ModelIter to make them more permissive #324

Merged
merged 2 commits into from
Nov 26, 2024
Merged

Adjust lifetimes on ModelIter to make them more permissive #324

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f38037
adjust lifetimes on ModelIter to make them more permissive
sgpthomas Nov 25, 2024
beae746
add test that only compiles with pr#324
sgpthomas Nov 26, 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
12 changes: 6 additions & 6 deletions z3/src/model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ impl<'ctx> Model<'ctx> {
}
}

pub fn iter(&'ctx self) -> ModelIter<'ctx> {
pub fn iter<'a>(&'a self) -> ModelIter<'a, 'ctx> {
self.into_iter()
}
}
Expand Down Expand Up @@ -162,15 +162,15 @@ impl<'ctx> Drop for Model<'ctx> {

#[derive(Debug)]
/// <https://z3prover.github.io/api/html/classz3py_1_1_model_ref.html#a7890b7c9bc70cf2a26a343c22d2c8367>
pub struct ModelIter<'ctx> {
model: &'ctx Model<'ctx>,
pub struct ModelIter<'a, 'ctx> {
model: &'a Model<'ctx>,
idx: u32,
len: u32,
}

impl<'ctx> IntoIterator for &'ctx Model<'ctx> {
impl<'a, 'ctx> IntoIterator for &'a Model<'ctx> {
type Item = FuncDecl<'ctx>;
type IntoIter = ModelIter<'ctx>;
type IntoIter = ModelIter<'a, 'ctx>;

fn into_iter(self) -> Self::IntoIter {
ModelIter {
Expand All @@ -181,7 +181,7 @@ impl<'ctx> IntoIterator for &'ctx Model<'ctx> {
}
}

impl<'ctx> Iterator for ModelIter<'ctx> {
impl<'a, 'ctx> Iterator for ModelIter<'a, 'ctx> {
type Item = FuncDecl<'ctx>;

fn next(&mut self) -> Option<Self::Item> {
Expand Down
Loading