fix: Wrap preconditions in a closure to prevent early return

[brandonpollack23]

In the same vein as #57 , preconditions also must be wrapped in a closure to correctly handle any included return statements and prevent them from returning from the instrumented function.

This PR also modifies the tests for execution order to include the return keyword, removes the hacky Parse implementations used in those tests, and instead constructs the appropriate *Condition structs directly.

Fixes #66

[brandonpollack23]

• fix: Wrap preconditions in a closure to prevent early return #69 👈 (View in Graphite)
• Add vscode rust analyzer config to select spec runtime behavior #68
• main

This stack of pull requests is managed by Graphite. Learn more about stacking.

[mkovaxx]

This is looking good, thanks!

Please add/extend an integration test in anodized to demonstrate that return statements in conditions are now handled correctly.

The easiest way is likely to change the following test case to be "maximally evil":

anodized/crates/anodized/tests/execution_order.rs

Lines 3 to 24 in 478df50

	#[spec(
	requires: [
	log.push("requires1") == (),
	log.push("requires2") == (),
	],
	maintains: [
	log.push("maintains1") == (),
	log.push("maintains2") == (),
	],
	captures: [
	log.push("captures1") as _alias1,
	log.push("captures2") as _alias2,
	],
	ensures: [
	log.push("ensures1") == (),
	log.push("ensures2") == (),
	],
	)]
	fn func(log: &mut Vec<&'static str>) {
	log.push("body");
	return;
	}

[brandonpollack23]

This change should do it

[brandonpollack23]

This is looking good, thanks!

Please add/extend an integration test in anodized to demonstrate that return statements in conditions are now handled correctly.

The easiest way is likely to change the following test case to be "maximally evil":

anodized/crates/anodized/tests/execution_order.rs

Lines 3 to 24 in 478df50

	#[spec(
	requires: [
	log.push("requires1") == (),
	log.push("requires2") == (),
	],
	maintains: [
	log.push("maintains1") == (),
	log.push("maintains2") == (),
	],
	captures: [
	log.push("captures1") as _alias1,
	log.push("captures2") as _alias2,
	],
	ensures: [
	log.push("ensures1") == (),
	log.push("ensures2") == (),
	],
	)]
	fn func(log: &mut Vec<&'static str>) {
	log.push("body");
	return;
	}

Ok latest push has all the comments addressed, have at it ☺️

[mkovaxx]

Good stuff! This is likely the last round before we can land it. :)

[brandonpollack23]

done 😏

[mkovaxx]

Getting super close. Just a few doc and test things.

[mkovaxx]

Please also update the README in anodized-core.

[mkovaxx]

Last one!

[brandonpollack23]

Ok I think we sorted it out

[mkovaxx]

@brandonpollack23 Looks good, thanks!

Please add some detail to the PR description, check that cargo test passes locally, then squash and merge.

[brandonpollack23]

Merge activity

• Jan 21, 5:05 AM UTC: A user started a stack merge that includes this pull request via Graphite.
• Jan 21, 5:27 AM UTC: Graphite couldn't merge this PR because it failed for an unknown reason (GitHub is reporting that this PR is not mergeable, despite passing required status checks defined by your branch protection rules. Please check your rulesets for additional blocking criteria. Graphite Merge Queue does not currently support rulesets. Please contact Graphite support for further assistance.).