Skip to content

feat: fixed intersection of focus skip and filters #327

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

Merged
andrii-a8c merged 5 commits into from
Nov 11, 2025
Merged

feat: fixed intersection of focus skip and filters #327

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
502c438
feat: fixed intersection of focus skip and filters
andrii-a8c Nov 7, 2025
97e4a07
Merge branch 'main' into issue-236
andrii-a8c Nov 7, 2025
184070d
feat: removed redudant field
andrii-a8c Nov 10, 2025
a53c293
Merge branch 'main' into issue-236
andrii-a8c Nov 10, 2025
ca029d3
Merge branch 'main' into issue-236
andrii-a8c Nov 11, 2025
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
52 changes: 21 additions & 31 deletions crates/move-stackless-bytecode/src/function_target_pipeline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ pub struct FunctionTargetsHolder {
targets: BTreeMap<QualifiedId<FunId>, BTreeMap<FunctionVariant, FunctionData>>,
function_specs: BiBTreeMap<QualifiedId<FunId>, QualifiedId<FunId>>,
no_verify_specs: BTreeSet<QualifiedId<FunId>>,
no_focus_specs: BTreeSet<QualifiedId<FunId>>,
omit_opaque_specs: BTreeSet<QualifiedId<FunId>>,
skip_specs: BTreeMap<QualifiedId<FunId>, String>,
focus_specs: BTreeSet<QualifiedId<FunId>>,
Expand Down Expand Up @@ -207,7 +206,6 @@ impl FunctionTargetsHolder {
targets: BTreeMap::new(),
function_specs: BiBTreeMap::new(),
no_verify_specs: BTreeSet::new(),
no_focus_specs: BTreeSet::new(),
omit_opaque_specs: BTreeSet::new(),
skip_specs: BTreeMap::new(),
focus_specs: BTreeSet::new(),
Expand Down Expand Up @@ -294,18 +292,14 @@ impl FunctionTargetsHolder {
self.function_specs.get_by_right(id)
}

pub fn no_verify_specs(&self) -> &BTreeSet<QualifiedId<FunId>> {
pub fn no_verify_specs(&self) -> Box<dyn Iterator<Item = &QualifiedId<FunId>> + '_> {
if self.focus_specs.is_empty() {
&self.no_verify_specs
Box::new(self.no_verify_specs.iter())
} else {
&self.no_focus_specs
Box::new(self.specs().filter(|s| !self.focus_specs.contains(s)))
}
}

pub fn no_focus_specs(&self) -> &BTreeSet<QualifiedId<FunId>> {
&self.no_focus_specs
}

pub fn focus_specs(&self) -> &BTreeSet<QualifiedId<FunId>> {
&self.focus_specs
}
Expand Down Expand Up @@ -346,10 +340,6 @@ impl FunctionTargetsHolder {
self.is_spec(id) && !self.no_verify_specs().contains(id)
}

pub fn is_focus_spec(&self, id: &QualifiedId<FunId>) -> bool {
self.is_spec(id) && !self.no_focus_specs.contains(id)
}

pub fn is_scenario_spec(&self, id: &QualifiedId<FunId>) -> bool {
self.scenario_specs.contains(id)
}
Expand Down Expand Up @@ -377,7 +367,7 @@ impl FunctionTargetsHolder {
}

pub fn verify_specs_count(&self) -> usize {
self.function_specs.len() + self.scenario_specs.len() - self.no_verify_specs().len()
self.function_specs.len() + self.scenario_specs.len() - self.no_verify_specs().count()
}

pub fn abort_checks_count(&self) -> usize {
Expand Down Expand Up @@ -519,26 +509,26 @@ impl FunctionTargetsHolder {
.insert(func_env.get_qualified_id(), skip.clone().unwrap());
}

if (!*prove && !*focus) || skip.is_some() || !targeted {
self.no_verify_specs.insert(func_env.get_qualified_id());
if *ignore_abort {
self.ignore_aborts.insert(func_env.get_qualified_id());
Comment thread
andrii-a8c marked this conversation as resolved.
}

if *focus {
if self.prover_options.ci {
func_env.module_env.env.diag(
Severity::Error,
&func_env.get_loc(),
"The 'focus' attribute is restricted in CI mode.",
);
return;
}
self.focus_specs.insert(func_env.get_qualified_id());
if skip.is_some() || !targeted {
self.no_verify_specs.insert(func_env.get_qualified_id());
} else {
self.no_focus_specs.insert(func_env.get_qualified_id());
Comment thread
andrii-a8c marked this conversation as resolved.
}

if *ignore_abort {
self.ignore_aborts.insert(func_env.get_qualified_id());
if *focus {
if self.prover_options.ci {
func_env.module_env.env.diag(
Severity::Error,
&func_env.get_loc(),
"The 'focus' attribute is restricted in CI mode.",
);
return;
}
self.focus_specs.insert(func_env.get_qualified_id());
} else if !*prove {
self.no_verify_specs.insert(func_env.get_qualified_id());
}
}

if target.is_some() {
Expand Down
Loading